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

package/src/local/client.ts

@@ -6,7 +6,8 @@ import {
   prefixSignatureKeyType,
 } from "../capabilities/permissions/mav2.js";
 import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
-import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls";
+import { internalStateDecorator } from "../internal/decorator.js";
+import type { PrepareCallsParams } from "../isomorphic/actions/prepareCalls.ts";
 import {
   createIsomorphicClient,
   type IsomorphicClient,
@@ -15,7 +16,7 @@ import type {
   CreateInnerClientParams,
   InnerClientActions,
   InnerWalletApiClient,
-} from "../types";
+} from "../types.ts";
 import { assertNever } from "../utils.js";
 
 const localMethods = [
@@ -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

@@ -2,13 +2,14 @@ import { Provider } from "ox";
 import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
 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";
+} 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/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 }
+>;