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

package/dist/types/{isomorphic/utils/createAccount.d.ts → internal/account.d.ts}

@@ -1,16 +1,13 @@
 import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
-import { type ModularAccountV2 } from "@account-kit/smart-contracts";
+import { type Chain, type Transport, type Address } from "viem";
 import type { StaticDecode } from "@sinclair/typebox";
-import type { Address, Chain, Transport } from "viem";
 import { SerializedInitcode } from "@alchemy/wallet-api-types";
-import { PermissionsCapability } from "@alchemy/wallet-api-types/capabilities";
 type CreateAccountParams = {
     chain: Chain;
     transport: Transport;
     signer: SmartAccountSigner;
     accountAddress: Address;
     counterfactualInfo?: StaticDecode<typeof SerializedInitcode>;
-    permissions?: StaticDecode<typeof PermissionsCapability>;
     delegation?: Address;
 };
 /**
@@ -19,6 +16,5 @@ type CreateAccountParams = {
  * @returns A promise that resolves to the created smart account.
  */
 export declare function createAccount(params: CreateAccountParams): Promise<SmartContractAccount>;
-export declare function isModularAccountV2(account: SmartContractAccount): account is ModularAccountV2;
 export {};
-//# sourceMappingURL=createAccount.d.ts.map
+//# sourceMappingURL=account.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/internal/account.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAO7E,OAAO,EAAa,KAAK,KAAK,EAAE,KAAK,SAAS,EAAE,KAAK,OAAO,EAAE,MAAM,MAAM,CAAC;AAC3E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAK/D,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,EAAE,SAAS,CAAC;IACrB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,cAAc,EAAE,OAAO,CAAC;IACxB,kBAAkB,CAAC,EAAE,YAAY,CAAC,OAAO,kBAAkB,CAAC,CAAC;IAC7D,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,oBAAoB,CAAC,CA2E/B"}

package/dist/types/types.d.ts

@@ -1,13 +1,12 @@
-import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
+import type { SmartContractAccount } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
 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 "@alchemy/wallet-api-types/rpc";
 export type CreateInnerClientParams<TAccount extends Address | undefined = Address | undefined> = {
     chain: Chain;
     transport: AlchemyTransport;
-    policyId?: string;
+    policyIds?: string[];
     account?: TAccount | Address | undefined;
 };
 export type InnerWalletApiClientBase<TExtend extends {
@@ -15,13 +14,8 @@ export type InnerWalletApiClientBase<TExtend extends {
 } | undefined = {
     [key: string]: unknown;
 } | undefined> = Client<Transport, Chain, JsonRpcAccount<Address> | undefined, WalletServerViemRpcSchema, {
-    policyId?: string;
+    policyIds?: string[];
 } & TExtend>;
-export type InnerClientActions = {
-    grantPermissions: (signer: SmartAccountSigner, params: GrantPermissionsParams & {
-        chainId: Hex;
-    }) => Promise<GrantPermissionsResult>;
-};
 export type CachedAccount = {
     account: SmartContractAccount;
     requestParams: RequestAccountParams;
@@ -30,7 +24,7 @@ export type InternalState = {
     setAccount: (account: CachedAccount) => void;
     getAccount: () => CachedAccount | undefined;
 };
-export type InnerWalletApiClient = InnerWalletApiClientBase<InnerClientActions & {
+export type InnerWalletApiClient = InnerWalletApiClientBase<{
     internal: InternalState;
 }>;
 export type WithoutChainId<T> = T extends {

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,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,+BAA+B,CAAC;AAE/E,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;AAEF,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,GACtD,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,GAClB,CAAC,CAAC;AAEN,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,UAAU,EAAE,GAAG,CAAA;CAAE,GAC5D,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,GACrB,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AACzD,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,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAC;AAC/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAE/E,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,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;IACrB,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,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,OAAO,CACnC,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,CAAC;IAC1D,QAAQ,EAAE,aAAa,CAAC;CACzB,CAAC,CAAC;AAEH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,OAAO,EAAE,GAAG,CAAA;CAAE,GACtD,IAAI,CAAC,CAAC,EAAE,SAAS,CAAC,GAClB,CAAC,CAAC;AAEN,MAAM,MAAM,iBAAiB,CAAC,CAAC,IAAI,CAAC,SAAS;IAAE,UAAU,EAAE,GAAG,CAAA;CAAE,GAC5D,IAAI,CAAC,CAAC,EAAE,YAAY,CAAC,GACrB,CAAC,CAAC"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@account-kit/wallet-client",
   "private": false,
   "type": "module",
-  "version": "0.1.0-alpha.11",
+  "version": "0.1.0-alpha.13",
   "main": "./dist/esm/exports/index.js",
   "module": "./dist/esm/exports/index.js",
   "types": "./dist/types/exports/index.d.ts",
@@ -26,11 +26,6 @@
       "require": "./dist/esm/exports/index.js",
       "import": "./dist/esm/exports/index.js"
     },
-    "./internal": {
-      "types": "./dist/types/exports/internal.d.ts",
-      "require": "./dist/esm/exports/internal.js",
-      "import": "./dist/esm/exports/internal.js"
-    },
     "./abi": {
       "types": "./dist/types/abi/index.d.ts",
       "require": "./dist/esm/abi/index.js",
@@ -61,7 +56,7 @@
     "@aa-sdk/core": "^4.43.1",
     "@account-kit/infra": "^4.43.1",
     "@account-kit/smart-contracts": "^4.43.1",
-    "@alchemy/wallet-api-types": "0.1.0-alpha.11",
+    "@alchemy/wallet-api-types": "0.1.0-alpha.13",
     "@sinclair/typebox": "^0.34.33",
     "deep-equal": "^2.2.3",
     "ox": "^0.6.12",
@@ -71,5 +66,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "gitHead": "62b331ec0e6d8d1d15f36920fa2ca07b266554d1"
+  "gitHead": "bccef95f8047c2284add0b44169eae7f54123cdf"
 }

package/src/client/actions/getCallsStatus.ts

@@ -1,12 +1,14 @@
-import type {
-  GetCallsStatusParams as IsomorphicGetCallsStatusParams,
-  GetCallsStatusResponse as IsomorphicGetCallsStatusResult,
-} from "../../isomorphic/actions/getCallsStatus.ts";
 import type { InnerWalletApiClient } from "../../types.ts";
+import type { Static } from "@sinclair/typebox";
+import { wallet_getCallsStatus } from "@alchemy/wallet-api-types/rpc";
 
-export type GetCallsStatusParams = IsomorphicGetCallsStatusParams;
+export type GetCallsStatusParams = Static<
+  typeof wallet_getCallsStatus
+>["Request"]["params"][0];
 
-export type GetCallsStatusResult = IsomorphicGetCallsStatusResult;
+export type GetCallsStatusResult = Static<
+  typeof wallet_getCallsStatus
+>["ReturnType"];
 
 /**
  * Gets the status of a prepared call by its ID.

package/src/client/actions/grantPermissions.ts

@@ -1,14 +1,30 @@
 import { AccountNotFoundError, type SmartAccountSigner } from "@aa-sdk/core";
-import { type Address, type Hex, type IsUndefined, toHex } from "viem";
-import type { CreateSessionParams } from "../../isomorphic/actions/createSession.ts";
+import {
+  toHex,
+  type Address,
+  type Hex,
+  type IsUndefined,
+  type Prettify,
+} from "viem";
 import type { InnerWalletApiClient } from "../../types.ts";
+import type { Static } from "@sinclair/typebox";
+import { wallet_createSession } from "@alchemy/wallet-api-types/rpc";
+import { encodePermissionsContext } from "@alchemy/wallet-api-types/capabilities";
+import { signSignatureRequest } from "./signSignatureRequest.js";
 
 export type GrantPermissionsParams<
   TAccount extends Address | undefined = Address | undefined,
-> = Omit<CreateSessionParams, "account" | "chainId" | "entityId"> &
-  (IsUndefined<TAccount> extends true
-    ? { account: Address }
-    : { account?: never });
+> = Prettify<
+  Omit<
+    Static<
+      (typeof wallet_createSession)["properties"]["Request"]["properties"]["params"]
+    >[0],
+    "account" | "chainId"
+  > &
+    (IsUndefined<TAccount> extends true
+      ? { account: Address }
+      : { account?: never })
+>;
 
 export type GrantPermissionsResult = {
   context: Hex;
@@ -83,9 +99,24 @@ export async function grantPermissions<
     throw new AccountNotFoundError();
   }
 
-  return client.grantPermissions(signer, {
-    ...params,
-    account,
-    chainId: toHex(client.chain.id),
+  const { sessionId, signatureRequest } = await client.request({
+    method: "wallet_createSession",
+    params: [
+      {
+        ...params,
+        account,
+        chainId: toHex(client.chain.id),
+      },
+    ],
   });
+
+  const signature = await signSignatureRequest(signer, signatureRequest);
+
+  return {
+    context: encodePermissionsContext({
+      contextVersion: "REMOTE_MODE_DEFERRED_ACTION",
+      sessionId,
+      signature: signature.data,
+    }),
+  };
 }

package/src/client/actions/prepareCalls.ts

@@ -1,10 +1,8 @@
 import { AccountNotFoundError } from "@aa-sdk/core";
 import { toHex, type Address, type IsUndefined } from "viem";
-import type {
-  PrepareCallsParams as IsomorphicPrepareCallsParams,
-  PrepareCallsResult as IsomorphicPrepareCallsResult,
-} from "../../isomorphic/actions/prepareCalls.ts";
 import type { InnerWalletApiClient } from "../../types.ts";
+import type { Static } from "@sinclair/typebox";
+import { wallet_prepareCalls } from "@alchemy/wallet-api-types/rpc";
 
 export type GetAccountParam<TAccount> =
   IsUndefined<TAccount> extends true
@@ -13,10 +11,17 @@ export type GetAccountParam<TAccount> =
 
 export type PrepareCallsParams<
   TAccount extends Address | undefined = Address | undefined,
-> = Omit<IsomorphicPrepareCallsParams, "from" | "chainId"> &
+> = Omit<
+  Static<
+    (typeof wallet_prepareCalls)["properties"]["Request"]["properties"]["params"]
+  >[0],
+  "from" | "chainId"
+> &
   (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never });
 
-export type PrepareCallsResult = IsomorphicPrepareCallsResult;
+export type PrepareCallsResult = Static<
+  typeof wallet_prepareCalls
+>["ReturnType"];
 
 /**
  * Prepares a set of contract calls for execution by building a user operation.
@@ -55,10 +60,10 @@ export async function prepareCalls<
     throw new AccountNotFoundError();
   }
 
-  if (client.policyId && !params.capabilities?.paymasterService) {
+  if (client.policyIds && !params.capabilities?.paymasterService) {
     params.capabilities = {
       ...params.capabilities,
-      paymasterService: { policyId: client.policyId },
+      paymasterService: { policyIds: client.policyIds },
     };
   }
 

package/src/client/actions/prepareSign.ts

@@ -1,17 +1,20 @@
 import type { InnerWalletApiClient } from "../../types.ts";
 import { toHex, type Address, type IsUndefined } from "viem";
-import type {
-  PrepareSignParams as IsomorphicPrepareSignParams,
-  PrepareSignResult as IsomorphicPrepareSignResult,
-} from "../../isomorphic/actions/prepareSign.ts";
 import { AccountNotFoundError } from "@aa-sdk/core";
+import type { Static } from "@sinclair/typebox";
+import { wallet_prepareSign } from "@alchemy/wallet-api-types/rpc";
 
 export type PrepareSignParams<
   TAccount extends Address | undefined = Address | undefined,
-> = Omit<IsomorphicPrepareSignParams, "from" | "chainId"> &
+> = Omit<
+  Static<
+    (typeof wallet_prepareSign)["properties"]["Request"]["properties"]["params"]
+  >[0],
+  "from" | "chainId"
+> &
   (IsUndefined<TAccount> extends true ? { from: Address } : { from?: never });
 
-export type PrepareSignResult = IsomorphicPrepareSignResult;
+export type PrepareSignResult = Static<typeof wallet_prepareSign>["ReturnType"];
 
 /**
  * Prepares a signature request for signing messages or transactions.

package/src/client/actions/requestAccount.ts

@@ -7,10 +7,10 @@ import { Value } from "@sinclair/typebox/value";
 import type { Address } from "abitype";
 import deepEqual from "deep-equal";
 import { custom } from "viem";
-import { createAccount } from "../../isomorphic/utils/createAccount.js";
 import type { wallet_requestAccount } from "@alchemy/wallet-api-types/rpc";
 import { SerializedInitcode } from "@alchemy/wallet-api-types";
 import type { InnerWalletApiClient } from "../../types.js";
+import { createAccount } from "../../internal/account.js";
 
 export type RequestAccountParams = Omit<
   Extract<