@account-kit/wallet-client 0.1.0-alpha.1 → 0.1.0-alpha.11

package/dist/esm/client/decorator.js

@@ -4,19 +4,21 @@ import { grantPermissions, } from "./actions/grantPermissions.js";
 import { listAccounts, } from "./actions/listAccounts.js";
 import { prepareCalls, } from "./actions/prepareCalls.js";
 import { requestAccount, } from "./actions/requestAccount.js";
-import { sendPreparedCalls } from "./actions/sendPreparedCalls.js";
+import { sendPreparedCalls, } from "./actions/sendPreparedCalls.js";
 import { signMessage } from "./actions/signMessage.js";
 import { signSignatureRequest, } from "./actions/signSignatureRequest.js";
-import { signTypedData } from "./actions/signTypedData.js";
+import { signTypedData, } from "./actions/signTypedData.js";
+import { signPreparedCalls, } from "./actions/signPreparedCalls.js";
 export function smartWalletClientActions(client, signer) {
     return {
         requestAccount: (params) => requestAccount(client, signer, params),
         createAccount: (params) => createAccount(client, signer, params),
         prepareCalls: (params) => prepareCalls(client, params),
-        listAccounts: (params) => listAccounts(client, params),
+        listAccounts: (params) => listAccounts(client, signer, params),
         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/dist/esm/client/decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../../src/client/decorator.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,aAAa,GAGd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,cAAc,GAGf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,gBAAgB,GAGjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,YAAY,GAGb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,YAAY,GAGb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,cAAc,GAGf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EACL,oBAAoB,GAGrB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAoC3D,MAAM,UAAU,wBAAwB,CACtC,MAA4B,EAC5B,MAA0B;IAE1B,OAAO;QACL,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAClE,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAChE,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC;QAChE,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;QAC1D,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC;QACtE,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC5D,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAChE,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;KACvE,CAAC;AACJ,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport type {\n  Hex,\n  JsonRpcAccount,\n  SignableMessage,\n  TypedDataDefinition,\n} from \"viem\";\nimport type {\n  SendPreparedCallsParams,\n  SendPreparedCallsResult,\n} from \"../isomorphic/actions/sendPreparedCalls\";\nimport type { InnerWalletApiClient } from \"../types\";\nimport {\n  createAccount,\n  type CreateAccountParams,\n  type CreateAccountResult,\n} from \"./actions/createAccount.js\";\nimport {\n  getCallsStatus,\n  type GetCallsStatusParams,\n  type GetCallsStatusResult,\n} from \"./actions/getCallsStatus.js\";\nimport {\n  grantPermissions,\n  type GrantPermissionsParams,\n  type GrantPermissionsResult,\n} from \"./actions/grantPermissions.js\";\nimport {\n  listAccounts,\n  type ListAccountsParams,\n  type ListAccountsResult,\n} from \"./actions/listAccounts.js\";\nimport {\n  prepareCalls,\n  type PrepareCallsParams,\n  type PrepareCallsResult,\n} from \"./actions/prepareCalls.js\";\nimport {\n  requestAccount,\n  type RequestAccountParams,\n  type RequestAccountResult,\n} from \"./actions/requestAccount.js\";\nimport { sendPreparedCalls } from \"./actions/sendPreparedCalls.js\";\nimport { signMessage } from \"./actions/signMessage.js\";\nimport {\n  signSignatureRequest,\n  type SignSignatureRequestParams,\n  type SignSignatureRequestResult,\n} from \"./actions/signSignatureRequest.js\";\nimport { signTypedData } from \"./actions/signTypedData.js\";\n\nexport type SmartWalletActions<\n  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,\n> = {\n  requestAccount: (\n    params?: RequestAccountParams<TAccount>,\n  ) => Promise<RequestAccountResult>;\n  prepareCalls: (\n    params: PrepareCallsParams<TAccount>,\n  ) => Promise<PrepareCallsResult>;\n  sendPreparedCalls: (\n    params: SendPreparedCallsParams,\n  ) => Promise<SendPreparedCallsResult>;\n  createAccount: (params: CreateAccountParams) => Promise<CreateAccountResult>;\n  listAccounts: (params: ListAccountsParams) => Promise<ListAccountsResult>;\n  getCallsStatus: (\n    params: GetCallsStatusParams,\n  ) => Promise<GetCallsStatusResult>;\n  signSignatureRequest: (\n    params: SignSignatureRequestParams,\n  ) => Promise<SignSignatureRequestResult>;\n  signMessage: (params: SignableMessage) => Promise<Hex>;\n  signTypedData: (params: TypedDataDefinition) => Promise<Hex>;\n  grantPermissions: (\n    params: GrantPermissionsParams<TAccount>,\n  ) => Promise<GrantPermissionsResult>;\n};\n\nexport function smartWalletClientActions<\n  TAccount extends JsonRpcAccount | undefined = JsonRpcAccount | undefined,\n>(\n  client: InnerWalletApiClient<TAccount>,\n  signer: SmartAccountSigner,\n): SmartWalletActions<TAccount>;\n\nexport function smartWalletClientActions(\n  client: InnerWalletApiClient,\n  signer: SmartAccountSigner,\n): SmartWalletActions {\n  return {\n    requestAccount: (params) => requestAccount(client, signer, params),\n    createAccount: (params) => createAccount(client, signer, params),\n    prepareCalls: (params) => prepareCalls(client, params),\n    listAccounts: (params) => listAccounts(client, params),\n    sendPreparedCalls: (params) => sendPreparedCalls(client, params),\n    getCallsStatus: (params) => getCallsStatus(client, params),\n    signSignatureRequest: (params) => signSignatureRequest(signer, params),\n    signMessage: (params) => signMessage(client, signer, params),\n    signTypedData: (params) => signTypedData(client, signer, params),\n    grantPermissions: (params) => grantPermissions(client, signer, params),\n  };\n}\n"]}
+{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../../src/client/decorator.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,GAGd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,cAAc,GAGf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,gBAAgB,GAGjB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EACL,YAAY,GAGb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,YAAY,GAGb,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,cAAc,GAGf,MAAM,6BAA6B,CAAC;AACrC,OAAO,EACL,iBAAiB,GAGlB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,WAAW,EAA0B,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EACL,oBAAoB,GAGrB,MAAM,mCAAmC,CAAC;AAC3C,OAAO,EACL,aAAa,GAEd,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,iBAAiB,GAGlB,MAAM,gCAAgC,CAAC;AAgCxC,MAAM,UAAU,wBAAwB,CAGtC,MAA4B,EAC5B,MAA0B;IAE1B,OAAO;QACL,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAClE,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAChE,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC;QACtD,YAAY,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC9D,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC;QAChE,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC;QAC1D,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,EAAE,MAAM,CAAC;QACtE,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC;QAChE,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAC5D,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;QAChE,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;KACvE,CAAC;AACJ,CAAC","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { Address, Hex } from \"viem\";\nimport type { InnerWalletApiClient } from \"../types.ts\";\nimport {\n  createAccount,\n  type CreateAccountParams,\n  type CreateAccountResult,\n} from \"./actions/createAccount.js\";\nimport {\n  getCallsStatus,\n  type GetCallsStatusParams,\n  type GetCallsStatusResult,\n} from \"./actions/getCallsStatus.js\";\nimport {\n  grantPermissions,\n  type GrantPermissionsParams,\n  type GrantPermissionsResult,\n} from \"./actions/grantPermissions.js\";\nimport {\n  listAccounts,\n  type ListAccountsParams,\n  type ListAccountsResult,\n} from \"./actions/listAccounts.js\";\nimport {\n  prepareCalls,\n  type PrepareCallsParams,\n  type PrepareCallsResult,\n} from \"./actions/prepareCalls.js\";\nimport {\n  requestAccount,\n  type RequestAccountParams,\n  type RequestAccountResult,\n} from \"./actions/requestAccount.js\";\nimport {\n  sendPreparedCalls,\n  type SendPreparedCallsParams,\n  type SendPreparedCallsResult,\n} from \"./actions/sendPreparedCalls.js\";\nimport { signMessage, type SignMessageParams } from \"./actions/signMessage.js\";\nimport {\n  signSignatureRequest,\n  type SignSignatureRequestParams,\n  type SignSignatureRequestResult,\n} from \"./actions/signSignatureRequest.js\";\nimport {\n  signTypedData,\n  type SignTypedDataParams,\n} from \"./actions/signTypedData.js\";\nimport {\n  signPreparedCalls,\n  type SignPreparedCallsParams,\n  type SignPreparedCallsResult,\n} from \"./actions/signPreparedCalls.js\";\n\nexport type SmartWalletActions<\n  TAccount extends Address | undefined = Address | undefined,\n> = {\n  requestAccount: (\n    params?: RequestAccountParams,\n  ) => Promise<RequestAccountResult>;\n  prepareCalls: (\n    params: PrepareCallsParams<TAccount>,\n  ) => Promise<PrepareCallsResult>;\n  sendPreparedCalls: (\n    params: SendPreparedCallsParams,\n  ) => Promise<SendPreparedCallsResult>;\n  createAccount: (params: CreateAccountParams) => Promise<CreateAccountResult>;\n  listAccounts: (params: ListAccountsParams) => Promise<ListAccountsResult>;\n  getCallsStatus: (\n    params: GetCallsStatusParams,\n  ) => Promise<GetCallsStatusResult>;\n  signSignatureRequest: (\n    params: SignSignatureRequestParams,\n  ) => Promise<SignSignatureRequestResult>;\n  signPreparedCalls: (\n    params: SignPreparedCallsParams,\n  ) => Promise<SignPreparedCallsResult>;\n  signMessage: (params: SignMessageParams) => Promise<Hex>;\n  signTypedData: (params: SignTypedDataParams) => Promise<Hex>;\n  grantPermissions: (\n    params: GrantPermissionsParams<TAccount>,\n  ) => Promise<GrantPermissionsResult>;\n};\n\nexport function smartWalletClientActions<\n  TAccount extends Address | undefined = Address | undefined,\n>(\n  client: InnerWalletApiClient,\n  signer: SmartAccountSigner,\n): SmartWalletActions<TAccount> {\n  return {\n    requestAccount: (params) => requestAccount(client, signer, params),\n    createAccount: (params) => createAccount(client, signer, params),\n    prepareCalls: (params) => prepareCalls(client, params),\n    listAccounts: (params) => listAccounts(client, signer, params),\n    sendPreparedCalls: (params) => sendPreparedCalls(client, params),\n    getCallsStatus: (params) => getCallsStatus(client, params),\n    signSignatureRequest: (params) => signSignatureRequest(signer, params),\n    signPreparedCalls: (params) => signPreparedCalls(signer, params),\n    signMessage: (params) => signMessage(client, signer, params),\n    signTypedData: (params) => signTypedData(client, signer, params),\n    grantPermissions: (params) => grantPermissions(client, signer, params),\n  };\n}\n"]}

package/dist/esm/client/index.d.ts

@@ -1,18 +1,44 @@
-import { type SmartAccountSigner } from "@aa-sdk/core";
-import { type AlchemyTransport } from "@account-kit/infra";
-import { type Address, type Chain, type IsUndefined, type JsonRpcAccount, type Prettify } from "viem";
-import type { InnerWalletApiClient } from "../types";
+import type { SmartAccountSigner } from "@aa-sdk/core";
+import type { AlchemyTransport } from "@account-kit/infra";
+import type { Address, Chain, Prettify } from "viem";
+import type { InnerWalletApiClient } from "../types.ts";
 import { type SmartWalletActions } from "./decorator.js";
-export type SmartWalletClientParams<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined> = Prettify<{
+export type SmartWalletClientParams<TAccount extends Address | undefined = Address | undefined> = Prettify<{
     transport: AlchemyTransport;
     chain: Chain;
     signer: SmartAccountSigner;
     mode: "local" | "remote";
     policyId?: string;
-} & (IsUndefined<TAccount> extends true ? {
-    account?: never;
-} : {
-    account: Address;
-})>;
-export declare function createSmartWalletClient<TAccount extends JsonRpcAccount<Address> | undefined = JsonRpcAccount<Address> | undefined>(params: SmartWalletClientParams<TAccount>): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;
-export declare function createSmartWalletClient<TAccount extends JsonRpcAccount<Address> = JsonRpcAccount<Address>>(params: SmartWalletClientParams<TAccount>): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;
+    account?: TAccount | Address | undefined;
+}>;
+export type SmartWalletClient<TAccount extends Address | undefined = Address | undefined> = InnerWalletApiClient & SmartWalletActions<TAccount>;
+/**
+ * Creates a smart wallet client that can be used to interact with a smart account.
+ *
+ * @param {SmartWalletClientParams} params - The parameters for creating the smart wallet client
+ * @param {AlchemyTransport} params.transport - The Alchemy transport to use
+ * @param {Chain} params.chain - The chain to use
+ * @param {SmartAccountSigner} params.signer - The signer to use for the smart account
+ * @param {"local" | "remote"} params.mode - The client's mode (local or remote).
+ * @param {string} [params.policyId] - The policy ID for gas sponsorship (optional)
+ * @param {Address} [params.account] - The smart account address to use (optional)
+ * @returns {SmartWalletClient} - A viem-compatible client
+ *
+ * @example
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ * import { alchemy, arbitrumSepolia } from "@account-kit/infra";
+ * import { generatePrivateKey } from "viem/accounts";
+ * import { createSmartWalletClient } from "@account-kit/wallet-client";
+ *
+ * const signer = LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey());
+ * const transport = alchemy({
+ *   apiKey: "your-alchemy-api-key",
+ * });
+ * const client = createSmartWalletClient({
+ *   transport,
+ *   chain: arbitrumSepolia,
+ *   mode: "remote",
+ *   signer,
+ * });
+ */
+export declare function createSmartWalletClient<TAccount extends Address | undefined = undefined>(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;

package/dist/esm/client/index.js

@@ -1,6 +1,3 @@
-import {} from "@aa-sdk/core";
-import {} from "@account-kit/infra";
-import {} from "viem";
 import { createLocalClient } from "../local/client.js";
 import { createRemoteClient } from "../remote/client.js";
 import { smartWalletClientActions, } from "./decorator.js";

package/dist/esm/client/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2B,MAAM,cAAc,CAAC;AACvD,OAAO,EAAyB,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAMN,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EACL,wBAAwB,GAEzB,MAAM,gBAAgB,CAAC;AAoCxB,MAAM,UAAU,uBAAuB,CAAC,MAA+B;IACrE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAErE,MAAM,WAAW,GACf,IAAI,KAAK,OAAO;QACd,CAAC,CAAC,iBAAiB,CAAC;YAChB,SAAS;YACT,KAAK;YACL,QAAQ;YACR,OAAO;SACR,CAAC;QACJ,CAAC,CAAC,kBAAkB,CAAC;YACjB,SAAS;YACT,KAAK;YACL,QAAQ;YACR,OAAO;SACR,CAAC,CAAC;IAET,yCAAyC;IACzC,qDAAqD;IACrD,4JAA4J;IAC5J,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CACnC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CACzC,CAAC;AACJ,CAAC;AAED,iBAAiB;AACjB,yDAAyD;AACzD,2CAA2C;AAC3C,wBAAwB;AACxB,4CAA4C;AAC5C,mBAAmB;AACnB,MAAM;AAEN,gEAAgE;AAEhE,sDAAsD;AACtD,2CAA2C;AAC3C,wBAAwB;AACxB,4CAA4C;AAC5C,mBAAmB;AACnB,0BAA0B;AAC1B,MAAM;AAEN,6DAA6D","sourcesContent":["import { type SmartAccountSigner } from \"@aa-sdk/core\";\nimport { type AlchemyTransport } from \"@account-kit/infra\";\nimport {\n  type Address,\n  type Chain,\n  type IsUndefined,\n  type JsonRpcAccount,\n  type Prettify,\n} from \"viem\";\nimport { createLocalClient } from \"../local/client.js\";\nimport { createRemoteClient } from \"../remote/client.js\";\nimport type { InnerWalletApiClient } from \"../types\";\nimport {\n  smartWalletClientActions,\n  type SmartWalletActions,\n} from \"./decorator.js\";\n\nexport type SmartWalletClientParams<\n  TAccount extends JsonRpcAccount<Address> | undefined =\n    | JsonRpcAccount<Address>\n    | undefined,\n> = Prettify<\n  {\n    transport: AlchemyTransport;\n    chain: Chain;\n    signer: SmartAccountSigner;\n    mode: \"local\" | \"remote\";\n    policyId?: string;\n  } & (IsUndefined<TAccount> extends true\n    ? {\n        account?: never;\n      }\n    : {\n        account: Address;\n      })\n>;\n\nexport function createSmartWalletClient<\n  TAccount extends JsonRpcAccount<Address> | undefined =\n    | JsonRpcAccount<Address>\n    | undefined,\n>(\n  params: SmartWalletClientParams<TAccount>,\n): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;\n\nexport function createSmartWalletClient<\n  TAccount extends JsonRpcAccount<Address> = JsonRpcAccount<Address>,\n>(\n  params: SmartWalletClientParams<TAccount>,\n): InnerWalletApiClient<TAccount> & SmartWalletActions<TAccount>;\n\nexport function createSmartWalletClient(params: SmartWalletClientParams) {\n  const { transport, chain, policyId, mode, account, signer } = params;\n\n  const innerClient =\n    mode === \"local\"\n      ? createLocalClient({\n          transport,\n          chain,\n          policyId,\n          account,\n        })\n      : createRemoteClient({\n          transport,\n          chain,\n          policyId,\n          account,\n        });\n\n  // TODO: we need to do a few things here:\n  // 1. decorate the client with the wallet api actions\n  // 2. potentially we might want to make this client async and have it use `requestAccount` so that it can create a SCA client with an account attached to it\n  return innerClient.extend((client) =>\n    smartWalletClientActions(client, signer),\n  );\n}\n\n// Example usage:\n// const clientWithoutAccount = createSmartWalletClient({\n//   transport: alchemy({ apiKey: \"123\" }),\n//   chain: baseSepolia,\n//   signer: createDummySigner(zeroAddress),\n//   mode: \"local\",\n// });\n\n// const account1 = await clientWithoutAccount.requestAccount();\n\n// const clientWithAccount = createSmartWalletClient({\n//   transport: alchemy({ apiKey: \"123\" }),\n//   chain: baseSepolia,\n//   signer: createDummySigner(zeroAddress),\n//   mode: \"local\",\n//   account: zeroAddress,\n// });\n\n// const account2 = await clientWithAccount.requestAccount();\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/client/index.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAEzD,OAAO,EACL,wBAAwB,GAEzB,MAAM,gBAAgB,CAAC;AAkDxB,MAAM,UAAU,uBAAuB,CACrC,MAA+B;IAE/B,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAErE,MAAM,WAAW,GACf,IAAI,KAAK,OAAO;QACd,CAAC,CAAC,iBAAiB,CAAC;YAChB,SAAS;YACT,KAAK;YACL,QAAQ;YACR,OAAO;SACR,CAAC;QACJ,CAAC,CAAC,kBAAkB,CAAC;YACjB,SAAS;YACT,KAAK;YACL,QAAQ;YACR,OAAO;SACR,CAAC,CAAC;IAET,yCAAyC;IACzC,qDAAqD;IACrD,4JAA4J;IAC5J,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CACnC,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,CACzC,CAAC;AACJ,CAAC;AAED,iBAAiB;AACjB,yDAAyD;AACzD,2CAA2C;AAC3C,wBAAwB;AACxB,4CAA4C;AAC5C,mBAAmB;AACnB,MAAM;AAEN,gEAAgE;AAEhE,sDAAsD;AACtD,2CAA2C;AAC3C,wBAAwB;AACxB,4CAA4C;AAC5C,mBAAmB;AACnB,0BAA0B;AAC1B,MAAM;AAEN,6DAA6D","sourcesContent":["import type { SmartAccountSigner } from \"@aa-sdk/core\";\nimport type { AlchemyTransport } from \"@account-kit/infra\";\nimport type { Address, Chain, Prettify } from \"viem\";\nimport { createLocalClient } from \"../local/client.js\";\nimport { createRemoteClient } from \"../remote/client.js\";\nimport type { InnerWalletApiClient } from \"../types.ts\";\nimport {\n  smartWalletClientActions,\n  type SmartWalletActions,\n} from \"./decorator.js\";\n\nexport type SmartWalletClientParams<\n  TAccount extends Address | undefined = Address | undefined,\n> = Prettify<{\n  transport: AlchemyTransport;\n  chain: Chain;\n  signer: SmartAccountSigner;\n  mode: \"local\" | \"remote\";\n  policyId?: string;\n  account?: TAccount | Address | undefined;\n}>;\n\nexport type SmartWalletClient<\n  TAccount extends Address | undefined = Address | undefined,\n> = InnerWalletApiClient & SmartWalletActions<TAccount>;\n\n/**\n * Creates a smart wallet client that can be used to interact with a smart account.\n *\n * @param {SmartWalletClientParams} params - The parameters for creating the smart wallet client\n * @param {AlchemyTransport} params.transport - The Alchemy transport to use\n * @param {Chain} params.chain - The chain to use\n * @param {SmartAccountSigner} params.signer - The signer to use for the smart account\n * @param {\"local\" | \"remote\"} params.mode - The client's mode (local or remote).\n * @param {string} [params.policyId] - The policy ID for gas sponsorship (optional)\n * @param {Address} [params.account] - The smart account address to use (optional)\n * @returns {SmartWalletClient} - A viem-compatible client\n *\n * @example\n * import { LocalAccountSigner } from \"@aa-sdk/core\";\n * import { alchemy, arbitrumSepolia } from \"@account-kit/infra\";\n * import { generatePrivateKey } from \"viem/accounts\";\n * import { createSmartWalletClient } from \"@account-kit/wallet-client\";\n *\n * const signer = LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey());\n * const transport = alchemy({\n *   apiKey: \"your-alchemy-api-key\",\n * });\n * const client = createSmartWalletClient({\n *   transport,\n *   chain: arbitrumSepolia,\n *   mode: \"remote\",\n *   signer,\n * });\n */\nexport function createSmartWalletClient<\n  TAccount extends Address | undefined = undefined,\n>(params: SmartWalletClientParams<TAccount>): SmartWalletClient<TAccount>;\n\nexport function createSmartWalletClient(\n  params: SmartWalletClientParams,\n): SmartWalletClient {\n  const { transport, chain, policyId, mode, account, signer } = params;\n\n  const innerClient =\n    mode === \"local\"\n      ? createLocalClient({\n          transport,\n          chain,\n          policyId,\n          account,\n        })\n      : createRemoteClient({\n          transport,\n          chain,\n          policyId,\n          account,\n        });\n\n  // TODO: we need to do a few things here:\n  // 1. decorate the client with the wallet api actions\n  // 2. potentially we might want to make this client async and have it use `requestAccount` so that it can create a SCA client with an account attached to it\n  return innerClient.extend((client) =>\n    smartWalletClientActions(client, signer),\n  );\n}\n\n// Example usage:\n// const clientWithoutAccount = createSmartWalletClient({\n//   transport: alchemy({ apiKey: \"123\" }),\n//   chain: baseSepolia,\n//   signer: createDummySigner(zeroAddress),\n//   mode: \"local\",\n// });\n\n// const account1 = await clientWithoutAccount.requestAccount();\n\n// const clientWithAccount = createSmartWalletClient({\n//   transport: alchemy({ apiKey: \"123\" }),\n//   chain: baseSepolia,\n//   signer: createDummySigner(zeroAddress),\n//   mode: \"local\",\n//   account: zeroAddress,\n// });\n\n// const account2 = await clientWithAccount.requestAccount();\n"]}

package/dist/esm/exports/index.d.ts

@@ -1,13 +1,12 @@
-export { createSmartWalletClient, type SmartWalletClientParams, } from "../client/index.js";
-export { WalletServerRpcSchema, type WalletServerRpcSchemaType, type WalletServerViemRpcSchema, } from "../rpc/schema.js";
-export { Capabilities } from "../capabilities/index.js";
-export { PaymasterCapability } from "../capabilities/paymaster.js";
-export { PermissionsArray, PermissionsCapability, PermissionsContext, PermissionsData, } from "../capabilities/permissions/index.js";
+export { createSmartWalletClient, type SmartWalletClient, type SmartWalletClientParams, } from "../client/index.js";
+export { WalletServerRpcSchema, type WalletServerRpcSchemaType, } from "@alchemy/wallet-api-types/rpc";
 export { createAccount } from "../client/actions/createAccount.js";
 export { getCallsStatus } from "../client/actions/getCallsStatus.js";
+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/dist/esm/exports/index.js

@@ -1,18 +1,16 @@
 // TODO: anything that we want to expose publicly should be exported from `index.ts` files in the subdirectories
 // and we shouldn't export * for the sake of tree-shaking
 export { createSmartWalletClient, } from "../client/index.js";
-export { WalletServerRpcSchema, } from "../rpc/schema.js";
-// capabilities: TODO: should these actually just have the types exported?
-export { Capabilities } from "../capabilities/index.js";
-export { PaymasterCapability } from "../capabilities/paymaster.js";
-export { PermissionsArray, PermissionsCapability, PermissionsContext, PermissionsData, } from "../capabilities/permissions/index.js";
+export { WalletServerRpcSchema, } from "@alchemy/wallet-api-types/rpc";
 // client actions
 export { createAccount } from "../client/actions/createAccount.js";
 export { getCallsStatus } from "../client/actions/getCallsStatus.js";
+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";
 //# sourceMappingURL=index.js.map

package/dist/esm/exports/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":"AAAA,gHAAgH;AAChH,yDAAyD;AACzD,OAAO,EACL,uBAAuB,GAExB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,qBAAqB,GAGtB,MAAM,kBAAkB,CAAC;AAE1B,0EAA0E;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EACL,gBAAgB,EAChB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,GAChB,MAAM,sCAAsC,CAAC;AAE9C,iBAAiB;AACjB,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC","sourcesContent":["// TODO: anything that we want to expose publicly should be exported from `index.ts` files in the subdirectories\n// and we shouldn't export * for the sake of tree-shaking\nexport {\n  createSmartWalletClient,\n  type SmartWalletClientParams,\n} from \"../client/index.js\";\n\nexport {\n  WalletServerRpcSchema,\n  type WalletServerRpcSchemaType,\n  type WalletServerViemRpcSchema,\n} from \"../rpc/schema.js\";\n\n// capabilities: TODO: should these actually just have the types exported?\nexport { Capabilities } from \"../capabilities/index.js\";\nexport { PaymasterCapability } from \"../capabilities/paymaster.js\";\nexport {\n  PermissionsArray,\n  PermissionsCapability,\n  PermissionsContext,\n  PermissionsData,\n} from \"../capabilities/permissions/index.js\";\n\n// client actions\nexport { createAccount } from \"../client/actions/createAccount.js\";\nexport { getCallsStatus } from \"../client/actions/getCallsStatus.js\";\nexport { listAccounts } from \"../client/actions/listAccounts.js\";\nexport { prepareCalls } from \"../client/actions/prepareCalls.js\";\nexport { requestAccount } from \"../client/actions/requestAccount.js\";\nexport { signMessage } from \"../client/actions/signMessage.js\";\nexport { signSignatureRequest } from \"../client/actions/signSignatureRequest.js\";\nexport { signTypedData } from \"../client/actions/signTypedData.js\";\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/exports/index.ts"],"names":[],"mappings":"AAAA,gHAAgH;AAChH,yDAAyD;AACzD,OAAO,EACL,uBAAuB,GAGxB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EACL,qBAAqB,GAEtB,MAAM,+BAA+B,CAAC;AAEvC,iBAAiB;AACjB,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uCAAuC,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AACrE,OAAO,EAAE,oBAAoB,EAAE,MAAM,2CAA2C,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC","sourcesContent":["// TODO: anything that we want to expose publicly should be exported from `index.ts` files in the subdirectories\n// and we shouldn't export * for the sake of tree-shaking\nexport {\n  createSmartWalletClient,\n  type SmartWalletClient,\n  type SmartWalletClientParams,\n} from \"../client/index.js\";\n\nexport {\n  WalletServerRpcSchema,\n  type WalletServerRpcSchemaType,\n} from \"@alchemy/wallet-api-types/rpc\";\n\n// client actions\nexport { createAccount } from \"../client/actions/createAccount.js\";\nexport { getCallsStatus } from \"../client/actions/getCallsStatus.js\";\nexport { grantPermissions } from \"../client/actions/grantPermissions.js\";\nexport { listAccounts } from \"../client/actions/listAccounts.js\";\nexport { prepareCalls } from \"../client/actions/prepareCalls.js\";\nexport { requestAccount } from \"../client/actions/requestAccount.js\";\nexport { signSignatureRequest } from \"../client/actions/signSignatureRequest.js\";\nexport { signPreparedCalls } from \"../client/actions/signPreparedCalls.js\";\nexport { signMessage } from \"../client/actions/signMessage.js\";\nexport { signTypedData } from \"../client/actions/signTypedData.js\";\n"]}

package/dist/esm/exports/internal.d.ts

@@ -1,13 +1,4 @@
-export * from "../capabilities/index.js";
-export * from "../capabilities/paymaster.js";
-export * from "../capabilities/permissions/index.js";
-export * from "../capabilities/permissions/mav2.js";
 export type * from "../isomorphic/client.js";
 export { createIsomorphicClient } from "../isomorphic/client.js";
 export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
-export * from "../rpc/request.js";
-export * as RpcSchemas from "../rpc/request.js";
-export * from "../rpc/schema.js";
-export * from "../schemas.js";
-export type * from "../types";
-export * from "../utils.js";
+export type * from "../types.ts";

package/dist/esm/exports/internal.js

@@ -1,15 +1,3 @@
-// exports from this file are meant to be imported by our packages in the monorepo
-// we will expose this in the package.json as a named export like `this-pkg/internal`
-// TODO: name `this-pkg`
-export * from "../capabilities/index.js";
-export * from "../capabilities/paymaster.js";
-export * from "../capabilities/permissions/index.js";
-export * from "../capabilities/permissions/mav2.js";
 export { createIsomorphicClient } from "../isomorphic/client.js";
 export { createDummySigner } from "../isomorphic/utils/createDummySigner.js";
-export * from "../rpc/request.js";
-export * as RpcSchemas from "../rpc/request.js";
-export * from "../rpc/schema.js";
-export * from "../schemas.js";
-export * from "../utils.js";
 //# sourceMappingURL=internal.js.map

package/dist/esm/exports/internal.js.map

@@ -1 +1 @@
-{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/exports/internal.ts"],"names":[],"mappings":"AAAA,kFAAkF;AAClF,qFAAqF;AACrF,wBAAwB;AACxB,cAAc,0BAA0B,CAAC;AACzC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,sCAAsC,CAAC;AACrD,cAAc,qCAAqC,CAAC;AAEpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAC7E,cAAc,mBAAmB,CAAC;AAClC,OAAO,KAAK,UAAU,MAAM,mBAAmB,CAAC;AAChD,cAAc,kBAAkB,CAAC;AACjC,cAAc,eAAe,CAAC;AAE9B,cAAc,aAAa,CAAC","sourcesContent":["// exports from this file are meant to be imported by our packages in the monorepo\n// we will expose this in the package.json as a named export like `this-pkg/internal`\n// TODO: name `this-pkg`\nexport * from \"../capabilities/index.js\";\nexport * from \"../capabilities/paymaster.js\";\nexport * from \"../capabilities/permissions/index.js\";\nexport * from \"../capabilities/permissions/mav2.js\";\nexport type * from \"../isomorphic/client.js\";\nexport { createIsomorphicClient } from \"../isomorphic/client.js\";\nexport { createDummySigner } from \"../isomorphic/utils/createDummySigner.js\";\nexport * from \"../rpc/request.js\";\nexport * as RpcSchemas from \"../rpc/request.js\";\nexport * from \"../rpc/schema.js\";\nexport * from \"../schemas.js\";\nexport type * from \"../types\";\nexport * from \"../utils.js\";\n"]}
+{"version":3,"file":"internal.js","sourceRoot":"","sources":["../../../src/exports/internal.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC","sourcesContent":["// exports from this file are meant to be imported by our packages in the monorepo\n// we will expose this in the package.json as a named export like `this-pkg/internal`\n// TODO: name `this-pkg`\nexport type * from \"../isomorphic/client.js\";\nexport { createIsomorphicClient } from \"../isomorphic/client.js\";\nexport { createDummySigner } from \"../isomorphic/utils/createDummySigner.js\";\n\nexport type * from \"../types.ts\";\n"]}

package/dist/esm/internal/decorator.d.ts

@@ -0,0 +1,2 @@
+import type { InternalState } from "../types.ts";
+export declare function internalStateDecorator(): InternalState;

package/dist/esm/internal/decorator.js

@@ -0,0 +1,10 @@
+export function internalStateDecorator() {
+    let account = undefined;
+    return {
+        setAccount: (newAccount) => {
+            account = newAccount;
+        },
+        getAccount: () => account,
+    };
+}
+//# sourceMappingURL=decorator.js.map

package/dist/esm/internal/decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"decorator.js","sourceRoot":"","sources":["../../../src/internal/decorator.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,sBAAsB;IACpC,IAAI,OAAO,GAA8B,SAAS,CAAC;IAEnD,OAAO;QACL,UAAU,EAAE,CAAC,UAAyB,EAAE,EAAE;YACxC,OAAO,GAAG,UAAU,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,GAAG,EAAE,CAAC,OAAO;KAC1B,CAAC;AACJ,CAAC","sourcesContent":["import type { CachedAccount, InternalState } from \"../types.ts\";\n\nexport function internalStateDecorator(): InternalState {\n  let account: CachedAccount | undefined = undefined;\n\n  return {\n    setAccount: (newAccount: CachedAccount) => {\n      account = newAccount;\n    },\n    getAccount: () => account,\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/createSession.d.ts

@@ -1,8 +1,7 @@
 import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
 import type { Static } from "@sinclair/typebox";
 import { type Chain, type Hex, type Transport } from "viem";
-import type { wallet_createSession } from "../../rpc/request.js";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import type { wallet_createSession, WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
 export type CreateSessionParams = Omit<Static<(typeof wallet_createSession)["properties"]["Request"]["properties"]["params"]>[0], "chainId"> & {
     entityId?: Hex;
 };

package/dist/esm/isomorphic/actions/createSession.js

@@ -1,36 +1,59 @@
 import { createSmartAccountClient, } from "@aa-sdk/core";
 import { deferralActions, PermissionBuilder, } from "@account-kit/smart-contracts/experimental";
 import { Value } from "@sinclair/typebox/value";
-import { ChainNotFoundError, custom, hexToNumber, toHex, } from "viem";
-import { TypePermission } from "../../capabilities/permissions/index.js";
-import { isGlobalValidation } from "../../capabilities/permissions/mav2.js";
+import { ChainNotFoundError, custom, hashTypedData, hexToNumber, toHex, } from "viem";
+import { InvalidRequestError } from "ox/RpcResponse";
+import { Permission, isGlobalValidation, } from "@alchemy/wallet-api-types/capabilities";
 import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
 import { createDummySigner } from "../utils/createDummySigner.js";
+import { supportsFeature } from "../utils/supportsFeature.js";
+import { isDelegated } from "../utils/7702.js";
 export async function createSession(client, params) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
-    const { counterfactualInfo } = await client.request({
+    const { counterfactualInfo, delegation } = await client.request({
         method: "wallet_requestAccount",
         params: [
             {
-                includeCounterfactualInfo: true,
                 accountAddress: params.account,
+                includeCounterfactualInfo: true,
             },
         ],
     });
-    if (!counterfactualInfo) {
-        throw new Error("No counterfactual info found.");
+    if (delegation &&
+        !(await isDelegated(client, {
+            address: params.account,
+            delegation,
+        }))) {
+        throw new InvalidRequestError({
+            message: "7702 account must be delegated before calling `wallet_createSession`",
+        });
+    }
+    if (!delegation && !counterfactualInfo) {
+        throw new InvalidRequestError({
+            message: "No counterfactual info found.",
+        });
     }
+    if (counterfactualInfo &&
+        !supportsFeature(counterfactualInfo, "permissions")) {
+        throw new InvalidRequestError({
+            message: "Account type does not support createSession",
+        });
+    }
+    // At this point we know the account supports the permission feature
     const account = await createAccount({
         chain: client.chain,
         transport: custom(client.transport),
         signer: createDummySigner(params.account),
         accountAddress: params.account,
         counterfactualInfo,
+        delegation,
     });
     if (!isModularAccountV2(account)) {
-        throw new Error("Sessions are currently only supported by MAv2 accounts.");
+        throw new InvalidRequestError({
+            message: "Sessions are currently only supported by MAv2 accounts.",
+        });
     }
     const _client = createSmartAccountClient({
         chain: client.chain,
@@ -43,21 +66,27 @@ export async function createSession(client, params) {
     });
     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) => Value.Encode(TypePermission, permission)),
+        permissions: params.permissions.map((permission) => Value.Encode(Permission, permission)),
     })
         .compileDeferred();
     return {
         sessionId: null, // In remote mode, the server will set this later.
+        chainId: toHex(client.chain.id),
         entityId: toHex(entityId),
         signatureRequest: {
             type: "eth_signTypedData_v4",
             data: typedData,
+            rawPayload: hashTypedData(typedData),
         },
         fullPreSignatureDeferredActionDigest,
     };

package/dist/esm/isomorphic/actions/createSession.js.map

@@ -1 +1 @@
-{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { TypePermission } from \"../../capabilities/permissions/index.js\";\nimport { isGlobalValidation } from \"../../capabilities/permissions/mav2.js\";\nimport type { wallet_createSession } from \"../../rpc/request.js\";\nimport type { WalletServerViemRpcSchema } from \"../../rpc/schema.js\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        includeCounterfactualInfo: true,\n        accountAddress: params.account,\n      },\n    ],\n  });\n  if (!counterfactualInfo) {\n    throw new Error(\"No counterfactual info found.\");\n  }\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new Error(\"Sessions are currently only supported by MAv2 accounts.\");\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: params.key,\n      entityId,\n      nonce,\n      deadline: params.expiry,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(TypePermission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\",\n      data: typedData,\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}
+{"version":3,"file":"createSession.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/createSession.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  createSmartAccountClient,\n  type SmartAccountClient,\n  type SmartContractAccount,\n} from \"@aa-sdk/core\";\nimport {\n  deferralActions,\n  PermissionBuilder,\n} from \"@account-kit/smart-contracts/experimental\";\nimport type { Static } from \"@sinclair/typebox\";\nimport { Value } from \"@sinclair/typebox/value\";\nimport {\n  ChainNotFoundError,\n  custom,\n  hashTypedData,\n  hexToNumber,\n  toHex,\n  type Chain,\n  type Hex,\n  type Transport,\n} from \"viem\";\nimport { InvalidRequestError } from \"ox/RpcResponse\";\nimport {\n  Permission,\n  isGlobalValidation,\n} from \"@alchemy/wallet-api-types/capabilities\";\nimport type {\n  wallet_createSession,\n  WalletServerViemRpcSchema,\n} from \"@alchemy/wallet-api-types/rpc\";\nimport { createAccount, isModularAccountV2 } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { supportsFeature } from \"../utils/supportsFeature.js\";\nimport { isDelegated } from \"../utils/7702.js\";\n\nexport type CreateSessionParams = Omit<\n  Static<\n    (typeof wallet_createSession)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n  >[0],\n  \"chainId\"\n> & {\n  entityId?: Hex;\n};\n\nexport type CreateSessionResult = Omit<\n  Static<(typeof wallet_createSession)[\"properties\"][\"ReturnType\"]>,\n  \"sessionId\"\n> & {\n  sessionId: Hex | null;\n  entityId: Hex;\n  fullPreSignatureDeferredActionDigest: Hex;\n};\n\nexport async function createSession(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: CreateSessionParams,\n): Promise<CreateSessionResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.account,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  if (\n    delegation &&\n    !(await isDelegated(client, {\n      address: params.account,\n      delegation,\n    }))\n  ) {\n    throw new InvalidRequestError({\n      message:\n        \"7702 account must be delegated before calling `wallet_createSession`\",\n    });\n  }\n\n  if (!delegation && !counterfactualInfo) {\n    throw new InvalidRequestError({\n      message: \"No counterfactual info found.\",\n    });\n  }\n\n  if (\n    counterfactualInfo &&\n    !supportsFeature(counterfactualInfo, \"permissions\")\n  ) {\n    throw new InvalidRequestError({\n      message: \"Account type does not support createSession\",\n    });\n  }\n\n  // At this point we know the account supports the permission feature\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.account),\n    accountAddress: params.account,\n    counterfactualInfo,\n    delegation,\n  });\n\n  if (!isModularAccountV2(account)) {\n    throw new InvalidRequestError({\n      message: \"Sessions are currently only supported by MAv2 accounts.\",\n    });\n  }\n\n  const _client = createSmartAccountClient({\n    chain: client.chain,\n    transport: custom(client.transport),\n    account,\n  }).extend(deferralActions);\n\n  const { entityId, nonce } = await _client.getEntityIdAndNonce({\n    entityId: params.entityId ? hexToNumber(params.entityId) : undefined,\n    isGlobalValidation: isGlobalValidation(params),\n  });\n\n  const { typedData, fullPreSignatureDeferredActionDigest } =\n    await new PermissionBuilder({\n      client: _client,\n      key: {\n        ...params.key,\n        // Alias 'ecdsa' to 'secp256k1'\n        type: params.key.type === \"ecdsa\" ? \"secp256k1\" : params.key.type,\n      },\n      entityId,\n      nonce,\n      deadline: params.expirySec,\n    })\n      .addPermissions({\n        permissions: params.permissions.map((permission) =>\n          Value.Encode(Permission, permission),\n        ),\n      })\n      .compileDeferred();\n\n  return {\n    sessionId: null, // In remote mode, the server will set this later.\n    chainId: toHex(client.chain.id),\n    entityId: toHex(entityId),\n    signatureRequest: {\n      type: \"eth_signTypedData_v4\" as const,\n      data: typedData,\n      rawPayload: hashTypedData(typedData),\n    },\n    fullPreSignatureDeferredActionDigest,\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/formatSign.d.ts

@@ -0,0 +1,8 @@
+import type { Static } from "@sinclair/typebox";
+import type { wallet_formatSign } from "@alchemy/wallet-api-types/rpc";
+import type { SmartAccountClient, SmartContractAccount } from "@aa-sdk/core";
+import { type Chain, type Transport } from "viem";
+import type { WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
+export type FormatSignParams = Static<(typeof wallet_formatSign)["properties"]["Request"]["properties"]["params"]>[0];
+export type FormatSignResult = Static<(typeof wallet_formatSign)["properties"]["ReturnType"]>;
+export declare function formatSign(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, params: FormatSignParams): Promise<FormatSignResult>;

package/dist/esm/isomorphic/actions/formatSign.js

@@ -0,0 +1,42 @@
+import { ChainNotFoundError, concat, custom, encodeAbiParameters, parseAbiParameters, } from "viem";
+import { createAccount } from "../utils/createAccount.js";
+import { createDummySigner } from "../utils/createDummySigner.js";
+import { magicBytes } from "ox/erc6492/WrappedSignature";
+export async function formatSign(client, params) {
+    if (!client.chain) {
+        throw new ChainNotFoundError();
+    }
+    const { counterfactualInfo, delegation } = await client.request({
+        method: "wallet_requestAccount",
+        params: [
+            {
+                accountAddress: params.from,
+                includeCounterfactualInfo: true,
+            },
+        ],
+    });
+    const account = await createAccount({
+        chain: client.chain,
+        transport: custom(client.transport),
+        signer: createDummySigner(params.from),
+        accountAddress: params.from,
+        counterfactualInfo,
+        permissions: params.capabilities?.permissions,
+        delegation,
+    });
+    let formattedSignature = await account.formatSign(params.signature.data);
+    if (counterfactualInfo && !(await account.isAccountDeployed())) {
+        formattedSignature = concat([
+            encodeAbiParameters(parseAbiParameters("address, bytes, bytes"), [
+                counterfactualInfo.factoryAddress,
+                counterfactualInfo.factoryData,
+                formattedSignature,
+            ]),
+            magicBytes,
+        ]);
+    }
+    return {
+        signature: formattedSignature,
+    };
+}
+//# sourceMappingURL=formatSign.js.map

package/dist/esm/isomorphic/actions/formatSign.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"formatSign.js","sourceRoot":"","sources":["../../../../src/isomorphic/actions/formatSign.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,kBAAkB,EAClB,MAAM,EACN,MAAM,EACN,mBAAmB,EACnB,kBAAkB,GAGnB,MAAM,MAAM,CAAC;AAEd,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAUzD,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,MAMC,EACD,MAAwB;IAExB,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;QAClB,MAAM,IAAI,kBAAkB,EAAE,CAAC;IACjC,CAAC;IAED,MAAM,EAAE,kBAAkB,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAAC,OAAO,CAAC;QAC9D,MAAM,EAAE,uBAAuB;QAC/B,MAAM,EAAE;YACN;gBACE,cAAc,EAAE,MAAM,CAAC,IAAI;gBAC3B,yBAAyB,EAAE,IAAI;aAChC;SACF;KACF,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,aAAa,CAAC;QAClC,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC;QACnC,MAAM,EAAE,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC;QACtC,cAAc,EAAE,MAAM,CAAC,IAAI;QAC3B,kBAAkB;QAClB,WAAW,EAAE,MAAM,CAAC,YAAY,EAAE,WAAW;QAC7C,UAAU;KACX,CAAC,CAAC;IAEH,IAAI,kBAAkB,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IAEzE,IAAI,kBAAkB,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC,EAAE,CAAC;QAC/D,kBAAkB,GAAG,MAAM,CAAC;YAC1B,mBAAmB,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,EAAE;gBAC/D,kBAAkB,CAAC,cAAc;gBACjC,kBAAkB,CAAC,WAAW;gBAC9B,kBAAkB;aACnB,CAAC;YACF,UAAU;SACX,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,SAAS,EAAE,kBAAkB;KAC9B,CAAC;AACJ,CAAC","sourcesContent":["import type { Static } from \"@sinclair/typebox\";\nimport type { wallet_formatSign } from \"@alchemy/wallet-api-types/rpc\";\nimport type { SmartAccountClient, SmartContractAccount } from \"@aa-sdk/core\";\nimport {\n  ChainNotFoundError,\n  concat,\n  custom,\n  encodeAbiParameters,\n  parseAbiParameters,\n  type Chain,\n  type Transport,\n} from \"viem\";\nimport type { WalletServerViemRpcSchema } from \"@alchemy/wallet-api-types/rpc\";\nimport { createAccount } from \"../utils/createAccount.js\";\nimport { createDummySigner } from \"../utils/createDummySigner.js\";\nimport { magicBytes } from \"ox/erc6492/WrappedSignature\";\n\nexport type FormatSignParams = Static<\n  (typeof wallet_formatSign)[\"properties\"][\"Request\"][\"properties\"][\"params\"]\n>[0];\n\nexport type FormatSignResult = Static<\n  (typeof wallet_formatSign)[\"properties\"][\"ReturnType\"]\n>;\n\nexport async function formatSign(\n  client: SmartAccountClient<\n    Transport,\n    Chain,\n    SmartContractAccount | undefined,\n    Record<string, unknown>,\n    WalletServerViemRpcSchema\n  >,\n  params: FormatSignParams,\n): Promise<FormatSignResult> {\n  if (!client.chain) {\n    throw new ChainNotFoundError();\n  }\n\n  const { counterfactualInfo, delegation } = await client.request({\n    method: \"wallet_requestAccount\",\n    params: [\n      {\n        accountAddress: params.from,\n        includeCounterfactualInfo: true,\n      },\n    ],\n  });\n\n  const account = await createAccount({\n    chain: client.chain,\n    transport: custom(client.transport),\n    signer: createDummySigner(params.from),\n    accountAddress: params.from,\n    counterfactualInfo,\n    permissions: params.capabilities?.permissions,\n    delegation,\n  });\n\n  let formattedSignature = await account.formatSign(params.signature.data);\n\n  if (counterfactualInfo && !(await account.isAccountDeployed())) {\n    formattedSignature = concat([\n      encodeAbiParameters(parseAbiParameters(\"address, bytes, bytes\"), [\n        counterfactualInfo.factoryAddress,\n        counterfactualInfo.factoryData,\n        formattedSignature,\n      ]),\n      magicBytes,\n    ]);\n  }\n\n  return {\n    signature: formattedSignature,\n  };\n}\n"]}

package/dist/esm/isomorphic/actions/getCallsStatus.d.ts

@@ -1,21 +1,7 @@
 import { type SmartAccountClient, type SmartContractAccount } from "@aa-sdk/core";
 import type { Static } from "@sinclair/typebox";
 import { type Chain, type Transport } from "viem";
-import type { wallet_getCallsStatus } from "../../rpc/request.js";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { type wallet_getCallsStatus, type WalletServerViemRpcSchema } from "@alchemy/wallet-api-types/rpc";
 export type GetCallsStatusParams = Static<(typeof wallet_getCallsStatus)["properties"]["Request"]["properties"]["params"]>[0];
 export type GetCallsStatusResponse = Static<(typeof wallet_getCallsStatus)["properties"]["ReturnType"]>;
-/** EIP-5792 call status codes */
-export declare const CallStatusCode: {
-    /** Batch has been received by the wallet but has not completed execution onchain */
-    readonly PENDING: 100;
-    /** Batch has been included onchain without reverts, receipts array contains info of all calls */
-    readonly CONFIRMED: 200;
-    /** Batch has not been included onchain and wallet will not retry */
-    readonly OFFCHAIN_FAILURE: 400;
-    /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */
-    readonly CHAIN_RULES_FAILURE: 500;
-    /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */
-    readonly PARTIAL_CHAIN_RULES_FAILURE: 600;
-};
 export declare function getCallsStatus(client: SmartAccountClient<Transport, Chain, SmartContractAccount | undefined, Record<string, unknown>, WalletServerViemRpcSchema>, callId: GetCallsStatusParams): Promise<GetCallsStatusResponse>;

package/dist/esm/isomorphic/actions/getCallsStatus.js

@@ -1,43 +1,54 @@
 import {} from "@aa-sdk/core";
 import { Value } from "@sinclair/typebox/value";
 import { ChainNotFoundError, isHex, } from "viem";
-import { TypeCallId } from "../../schemas.js";
+import { BaseError } from "ox/RpcResponse";
+import { CallStatusCode, CallStatusErrorCode, } from "@alchemy/wallet-api-types/rpc";
+import { CallId } from "@alchemy/wallet-api-types";
 import { castToHex } from "../../utils.js";
-const ReceiptStatus = {
-    reverted: "0x0",
-    success: "0x1",
-};
-/** EIP-5792 call status codes */
-export const CallStatusCode = {
-    /** Batch has been received by the wallet but has not completed execution onchain */
-    PENDING: 100,
-    /** Batch has been included onchain without reverts, receipts array contains info of all calls */
-    CONFIRMED: 200,
-    /** Batch has not been included onchain and wallet will not retry */
-    OFFCHAIN_FAILURE: 400,
-    /** Batch reverted *completely* and only changes related to gas charge may have been included onchain */
-    CHAIN_RULES_FAILURE: 500,
-    /** Batch reverted *partially* and some changes related to batch calls may have been included onchain */
-    PARTIAL_CHAIN_RULES_FAILURE: 600,
-};
 export async function getCallsStatus(client, callId) {
     if (!client.chain) {
         throw new ChainNotFoundError();
     }
-    const { chainId, hash } = Value.Decode(TypeCallId, callId);
-    const result = await client.getUserOperationReceipt(hash);
-    return {
+    const { chainId, hash } = Value.Decode(CallId, callId);
+    const baseResp = {
         id: callId,
         chainId,
         atomic: true,
-        status: !result?.receipt
-            ? CallStatusCode.PENDING
-            : result.success
-                ? CallStatusCode.CONFIRMED
-                : CallStatusCode.CHAIN_RULES_FAILURE,
-        receipts: !result?.receipt ? undefined : [transformReceipt(result.receipt)],
+    };
+    const result = await client.getUserOperationByHash(hash);
+    if (!result) {
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    if (result && !result.transactionHash) {
+        // A result but no txn hash means it's valid but pending.
+        return {
+            ...baseResp,
+            status: CallStatusCode.PENDING,
+        };
+    }
+    const receipt = await client.getUserOperationReceipt(hash);
+    if (!receipt) {
+        // Handles edge case of hash being retrieved immediately before the 150 block limit falloff.
+        throw new BaseError({
+            message: `callId ${callId} not found`,
+            code: CallStatusErrorCode.UNKNOWN_BUNDLE_ID,
+        });
+    }
+    return {
+        ...baseResp,
+        status: receipt.success
+            ? CallStatusCode.CONFIRMED
+            : CallStatusCode.CHAIN_RULES_FAILURE,
+        receipts: [transformReceipt(receipt.receipt)],
     };
 }
+const ReceiptStatus = {
+    reverted: "0x0",
+    success: "0x1",
+};
 function transformReceipt(receipt) {
     return {
         // viem's type for status is "success" | "reverted", but the actual value seems to already be 0x0 or 0x1