@account-kit/wallet-client 0.1.0-alpha.0 → 0.1.0-alpha.2

package/src/exports/index.ts

@@ -3,30 +3,31 @@
 export {
   createSmartWalletClient,
   type SmartWalletClientParams,
-} from "../client";
+} from "../client/index.js";
 
 export {
   WalletServerRpcSchema,
   type WalletServerRpcSchemaType,
   type WalletServerViemRpcSchema,
-} from "../rpc/schema";
+} from "../rpc/schema.js";
 
 // capabilities: TODO: should these actually just have the types exported?
-export { Capabilities } from "../capabilities";
-export { PaymasterCapability } from "../capabilities/paymaster";
+export { Capabilities } from "../capabilities/index.js";
+export { PaymasterCapability } from "../capabilities/paymaster.js";
 export {
   PermissionsArray,
   PermissionsCapability,
   PermissionsContext,
   PermissionsData,
-} from "../capabilities/permissions";
+} from "../capabilities/permissions/index.js";
 
 // client actions
-export { createAccount } from "../client/actions/createAccount";
-export { listAccounts } from "../client/actions/listAccounts";
-export { prepareCalls } from "../client/actions/prepareCalls";
-export { requestAccount } from "../client/actions/requestAccount";
-export { getCallsStatus } from "../client/actions/getCallsStatus";
-export { signSignatureRequest } from "../client/actions/signSignatureRequest";
-export { signMessage } from "../client/actions/signMessage";
-export { signTypedData } from "../client/actions/signTypedData";
+export { createAccount } from "../client/actions/createAccount.js";
+export { getCallsStatus } from "../client/actions/getCallsStatus.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 { signTypedData } from "../client/actions/signTypedData.js";
+export { grantPermissions } from "../client/actions/grantPermissions.js";

package/src/exports/internal.ts

@@ -1,16 +1,16 @@
 // 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";
-export * from "../capabilities/paymaster";
-export * from "../capabilities/permissions";
-export * from "../capabilities/permissions/mav2";
-export type * from "../isomorphic/client";
-export { createIsomorphicClient } from "../isomorphic/client";
-export { createDummySigner } from "../isomorphic/utils/createDummySigner";
-export * from "../rpc/request";
-export * as RpcSchemas from "../rpc/request";
-export * from "../rpc/schema";
-export * from "../schemas";
-export type * from "../types";
-export * from "../utils";
+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.ts";
+export * from "../utils.js";

package/src/internal/decorator.ts

@@ -0,0 +1,12 @@
+import type { CachedAccount, InternalState } from "../types.ts";
+
+export function internalStateDecorator(): InternalState {
+  let account: CachedAccount | undefined = undefined;
+
+  return {
+    setAccount: (newAccount: CachedAccount) => {
+      account = newAccount;
+    },
+    getAccount: () => account,
+  };
+}

package/src/isomorphic/actions/createSession.ts

@@ -3,27 +3,27 @@ import {
   type SmartAccountClient,
   type SmartContractAccount,
 } from "@aa-sdk/core";
+import {
+  deferralActions,
+  PermissionBuilder,
+} from "@account-kit/smart-contracts/experimental";
+import type { Static } from "@sinclair/typebox";
+import { Value } from "@sinclair/typebox/value";
 import {
   ChainNotFoundError,
-  type Chain,
-  type Transport,
   custom,
   hexToNumber,
-  type Hex,
   toHex,
+  type Chain,
+  type Hex,
+  type Transport,
 } from "viem";
-import type { wallet_createSession } from "../../rpc/request";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
-import type { Static } from "@sinclair/typebox";
-import { isGlobalValidation } from "../../capabilities/permissions/mav2";
-import {
-  deferralActions,
-  PermissionBuilder,
-} from "@account-kit/smart-contracts/experimental";
-import { createDummySigner } from "../utils/createDummySigner";
-import { createAccount, isModularAccountV2 } from "../utils/createAccount";
-import { Value } from "@sinclair/typebox/value";
-import { TypePermission } from "../../capabilities/permissions";
+import { TypePermission } from "../../capabilities/permissions/index.js";
+import { isGlobalValidation } from "../../capabilities/permissions/mav2.js";
+import type { wallet_createSession } from "../../rpc/request.js";
+import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { createAccount, isModularAccountV2 } from "../utils/createAccount.js";
+import { createDummySigner } from "../utils/createDummySigner.js";
 
 export type CreateSessionParams = Omit<
   Static<

package/src/isomorphic/actions/getCallsStatus.ts

@@ -3,19 +3,19 @@ import {
   type SmartContractAccount,
 } from "@aa-sdk/core";
 import type { Static } from "@sinclair/typebox";
+import { Value } from "@sinclair/typebox/value";
 import {
   ChainNotFoundError,
+  isHex,
   type Chain,
   type Hex,
   type TransactionReceipt,
   type Transport,
-  isHex,
 } from "viem";
-import type { wallet_getCallsStatus } from "../../rpc/request";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
-import { TypeCallId } from "../../schemas";
-import { castToHex } from "../../utils";
-import { Value } from "@sinclair/typebox/value";
+import type { wallet_getCallsStatus } from "../../rpc/request.js";
+import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { TypeCallId } from "../../schemas.js";
+import { castToHex } from "../../utils.js";
 
 export type GetCallsStatusParams = Static<
   (typeof wallet_getCallsStatus)["properties"]["Request"]["properties"]["params"]

package/src/isomorphic/actions/prepareCalls.ts

@@ -13,10 +13,10 @@ import {
   type Chain,
   type Transport,
 } from "viem";
-import type { wallet_prepareCalls } from "../../rpc/request";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
-import { createAccount } from "../utils/createAccount";
-import { createDummySigner } from "../utils/createDummySigner";
+import type { wallet_prepareCalls } from "../../rpc/request.js";
+import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { createAccount } from "../utils/createAccount.js";
+import { createDummySigner } from "../utils/createDummySigner.js";
 
 export type PrepareCallsParams = Omit<
   Static<

package/src/isomorphic/actions/sendPreparedCalls.ts

@@ -14,10 +14,10 @@ import {
   type Hex,
   type Transport,
 } from "viem";
-import { decodePermissionsContext } from "../../capabilities/permissions/mav2";
-import type { wallet_sendPreparedCalls } from "../../rpc/request";
-import type { WalletServerViemRpcSchema } from "../../rpc/schema";
-import { TypeCallId } from "../../schemas";
+import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
+import type { wallet_sendPreparedCalls } from "../../rpc/request.js";
+import type { WalletServerViemRpcSchema } from "../../rpc/schema.js";
+import { TypeCallId } from "../../schemas.js";
 
 export type SendPreparedCallsParams = Omit<
   StaticDecode<

package/src/isomorphic/client.ts

@@ -11,20 +11,23 @@ import {
   type AlchemyTransport,
 } from "@account-kit/infra";
 import { type Chain, type Transport } from "viem";
-import type { WalletServerViemRpcSchema } from "../rpc/schema";
+import type { WalletServerViemRpcSchema } from "../rpc/schema.js";
 import {
   createSession,
   type CreateSessionParams,
-} from "./actions/createSession";
+} from "./actions/createSession.js";
 import {
   getCallsStatus,
   type GetCallsStatusParams,
-} from "./actions/getCallsStatus";
-import { prepareCalls, type PrepareCallsParams } from "./actions/prepareCalls";
+} from "./actions/getCallsStatus.js";
+import {
+  prepareCalls,
+  type PrepareCallsParams,
+} from "./actions/prepareCalls.js";
 import {
   sendPreparedCalls,
   type SendPreparedCallsParams,
-} from "./actions/sendPreparedCalls";
+} from "./actions/sendPreparedCalls.js";
 
 // let's start with something that takes in as many params as possible, then we can eliminate them as we don't need them
 type ClientParams = {

package/src/isomorphic/utils/createAccount.ts

@@ -6,9 +6,9 @@ import {
 import type { StaticDecode } from "@sinclair/typebox";
 import type { Address, Chain, Transport } from "viem";
 import { concatHex, hexToNumber } from "viem";
-import type { TypeSerializedInitcode } from "../../schemas";
-import type { Capabilities } from "../../capabilities";
-import { parsePermissionsContext } from "./parsePermissionsContext";
+import type { Capabilities } from "../../capabilities/index.js";
+import type { TypeSerializedInitcode } from "../../schemas.js";
+import { parsePermissionsContext } from "./parsePermissionsContext.js";
 
 type CreateAccountParams = {
   chain: Chain;

package/src/isomorphic/utils/parsePermissionsContext.ts

@@ -1,8 +1,8 @@
 import type { StaticDecode } from "@sinclair/typebox";
-import type { PrepareCallsParams } from "../actions/prepareCalls";
-import type { TypeSerializedInitcode } from "../../schemas";
 import { InvalidRequestError } from "ox/RpcResponse";
-import { decodePermissionsContext } from "../../capabilities/permissions/mav2";
+import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
+import type { TypeSerializedInitcode } from "../../schemas.js";
+import type { PrepareCallsParams } from "../actions/prepareCalls.js";
 
 export function parsePermissionsContext(
   capabilities: PrepareCallsParams["capabilities"],

package/src/local/client.ts

@@ -4,19 +4,20 @@ import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
 import {
   encodePermissionsContext,
   prefixSignatureKeyType,
-} from "../capabilities/permissions/mav2";
-import { signSignatureRequest } from "../client/actions/signSignatureRequest";
-import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls";
+} from "../capabilities/permissions/mav2.js";
+import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
+import { internalStateDecorator } from "../internal/decorator.js";
+import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls.ts";
 import {
   createIsomorphicClient,
   type IsomorphicClient,
-} from "../isomorphic/client";
+} from "../isomorphic/client.js";
 import type {
   CreateInnerClientParams,
   InnerClientActions,
   InnerWalletApiClient,
-} from "../types";
-import { assertNever } from "../utils";
+} from "../types.ts";
+import { assertNever } from "../utils.js";
 
 const localMethods = [
   "wallet_prepareCalls",
@@ -51,46 +52,51 @@ export function createLocalClient(
     overrides: [
       {
         methods: localMethods,
-        transport: custom({
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          async request(args: { method: LocalMethod; params: any }) {
-            switch (args.method) {
-              case "wallet_prepareCalls": {
-                const params = args.params[0] as PrepareCallsParams;
-                const capabilityPolicyId =
-                  params.capabilities?.paymasterService?.policyId;
+        transport: custom(
+          {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            async request(args: { method: LocalMethod; params: any }) {
+              switch (args.method) {
+                case "wallet_prepareCalls": {
+                  const params = args.params[0] as PrepareCallsParams;
+                  const capabilityPolicyId =
+                    params.capabilities?.paymasterService?.policyId;
 
-                if (
-                  capabilityPolicyId != null &&
-                  policyId !== capabilityPolicyId &&
-                  !clientMap[capabilityPolicyId]
-                ) {
-                  clientMap[capabilityPolicyId] = createIsomorphicClient({
-                    transport,
-                    chain,
-                    policyId: capabilityPolicyId,
-                  });
-                }
+                  if (
+                    capabilityPolicyId != null &&
+                    policyId !== capabilityPolicyId &&
+                    !clientMap[capabilityPolicyId]
+                  ) {
+                    clientMap[capabilityPolicyId] = createIsomorphicClient({
+                      transport,
+                      chain,
+                      policyId: capabilityPolicyId,
+                    });
+                  }
 
-                const client =
-                  clientMap[capabilityPolicyId ?? policyId ?? "default"];
-                return client.prepareCalls(params);
-              }
-              case "wallet_sendPreparedCalls":
-                return isomorphicClient.sendPreparedCalls(args.params[0]);
-              case "wallet_getCallsStatus":
-                return isomorphicClient.getCallsStatus(args.params[0]);
-              case "wallet_createSession": {
-                return isomorphicClient.createSession(args.params[0]);
+                  const client =
+                    clientMap[capabilityPolicyId ?? policyId ?? "default"];
+                  return client.prepareCalls(params);
+                }
+                case "wallet_sendPreparedCalls":
+                  return isomorphicClient.sendPreparedCalls(args.params[0]);
+                case "wallet_getCallsStatus":
+                  return isomorphicClient.getCallsStatus(args.params[0]);
+                case "wallet_createSession": {
+                  return isomorphicClient.createSession(args.params[0]);
+                }
+                default:
+                  return assertNever(
+                    args.method,
+                    `Unexpected method: ${args.method}`,
+                  );
               }
-              default:
-                return assertNever(
-                  args.method,
-                  `Unexpected method: ${args.method}`,
-                );
-            }
+            },
           },
-        }),
+          {
+            retryCount: 0,
+          },
+        ),
       },
     ],
     fallback: transport,
@@ -100,10 +106,14 @@ export function createLocalClient(
     transport: innerTransport,
     chain,
     account,
-  }).extend(() => ({
-    policyId,
-    ...innerClientActions(isomorphicClient),
-  }));
+  })
+    .extend(() => ({
+      policyId,
+      ...innerClientActions(isomorphicClient),
+    }))
+    .extend(() => ({
+      internal: internalStateDecorator(),
+    }));
 }
 
 const innerClientActions = (

package/src/remote/client.ts

@@ -1,14 +1,15 @@
 import { Provider } from "ox";
 import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
-import { WalletServerRpcSchema } from "../rpc/schema";
+import { encodePermissionsContext } from "../capabilities/permissions/mav2.js";
+import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
+import { internalStateDecorator } from "../internal/decorator.js";
+import { WalletServerRpcSchema } from "../rpc/schema.js";
 import type {
   CreateInnerClientParams,
   InnerClientActions,
   InnerWalletApiClient,
   InnerWalletApiClientBase,
-} from "../types";
-import { signSignatureRequest } from "../client/actions/signSignatureRequest";
-import { encodePermissionsContext } from "../capabilities/permissions/mav2";
+} from "../types.ts";
 
 export function createRemoteClient<
   TAccount extends JsonRpcAccount<Address> | undefined =
@@ -34,10 +35,14 @@ export function createRemoteClient(
       ),
     chain,
     account,
-  }).extend((_client) => ({
-    policyId: params.policyId,
-    ...innerClientActions(_client),
-  }));
+  })
+    .extend((_client) => ({
+      policyId: params.policyId,
+      ...innerClientActions(_client),
+    }))
+    .extend(() => ({
+      internal: internalStateDecorator(),
+    }));
 
   return client;
 }

package/src/rpc/request.ts

@@ -1,9 +1,9 @@
 import { Type } from "@sinclair/typebox";
-import { Capabilities } from "../capabilities";
+import { Capabilities } from "../capabilities/index.js";
 import {
   PermissionsContext,
   PermissionsData,
-} from "../capabilities/permissions";
+} from "../capabilities/permissions/index.js";
 import {
   TypeAddress,
   TypeBase64UrlEncodedString,
@@ -14,7 +14,7 @@ import {
   TypeUserOperationRequest_v6,
   TypeUserOperationRequest_v7,
   TypeUuid,
-} from "../schemas";
+} from "../schemas.js";
 
 export const wallet_sendPreparedCalls = Type.Object(
   {

package/src/rpc/schema.ts

@@ -1,6 +1,6 @@
 import { type Static, type StaticDecode } from "@sinclair/typebox";
 import { RpcSchema } from "ox";
-import * as Requests from "./request";
+import * as Requests from "./request.js";
 
 export const WalletServerRpcSchema = RpcSchema.from<
   | Static<typeof Requests.wallet_prepareCalls>

package/src/types.ts

@@ -1,3 +1,4 @@
+import type { SmartAccountSigner, SmartContractAccount } from "@aa-sdk/core";
 import type { AlchemyTransport } from "@account-kit/infra";
 import type {
   Address,
@@ -8,12 +9,12 @@ import type {
   JsonRpcAccount,
   Transport,
 } from "viem";
-import type { WalletServerViemRpcSchema } from "./rpc/schema";
-import type { SmartAccountSigner } from "@aa-sdk/core";
 import type {
   GrantPermissionsParams,
   GrantPermissionsResult,
-} from "./client/actions/grantPermissions";
+} 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 =
@@ -53,8 +54,21 @@ export type InnerClientActions = {
   ) => Promise<GrantPermissionsResult>;
 };
 
+export type CachedAccount = {
+  account: SmartContractAccount;
+  requestParams: RequestAccountParams;
+};
+
+export type InternalState = {
+  setAccount: (account: CachedAccount) => void;
+  getAccount: () => CachedAccount | undefined;
+};
+
 export type InnerWalletApiClient<
   TAccount extends JsonRpcAccount<Address> | undefined =
     | JsonRpcAccount<Address>
     | undefined,
-> = InnerWalletApiClientBase<TAccount, InnerClientActions>;
+> = InnerWalletApiClientBase<
+  TAccount,
+  InnerClientActions & { internal: InternalState }
+>;