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

package/src/local/client.ts

@@ -1,6 +1,6 @@
 import { split } from "@aa-sdk/core";
 import { buildDeferredActionDigest } from "@account-kit/smart-contracts/experimental";
-import { createClient, custom, type Address, type JsonRpcAccount } from "viem";
+import { createClient, custom, type Address } from "viem";
 import {
   encodePermissionsContext,
   prefixSignatureKeyType,
@@ -28,10 +28,8 @@ const localMethods = [
 type LocalMethod = (typeof localMethods)[number];
 
 export function createLocalClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
+  TAccount extends Address | undefined = Address | undefined,
+>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;
 
 export function createLocalClient(
   params: CreateInnerClientParams,
@@ -123,19 +121,15 @@ const innerClientActions = (
     grantPermissions: async (signer, params) => {
       const { signatureRequest, fullPreSignatureDeferredActionDigest } =
         await isomorphicClient.createSession(params);
-      const { signedAuthorization, signature } = await signSignatureRequest(
-        signer,
-        signatureRequest,
-      );
+      const signature = await signSignatureRequest(signer, signatureRequest);
       return {
         context: encodePermissionsContext({
           contextVersion: "LOCAL_MODE_DEFERRED_ACTION",
           deferredAction: buildDeferredActionDigest({
             fullPreSignatureDeferredActionDigest,
-            sig: prefixSignatureKeyType(signature, "secp256k1"),
+            sig: prefixSignatureKeyType(signature.data, signature.type),
           }),
         }),
-        signedAuthorization,
       };
     },
   };

package/src/remote/client.ts

@@ -1,11 +1,5 @@
 import { Provider } from "ox";
-import {
-  BaseError,
-  createClient,
-  custom,
-  type Address,
-  type JsonRpcAccount,
-} from "viem";
+import { createClient, custom, type Address } from "viem";
 import { encodePermissionsContext } from "../capabilities/permissions/mav2.js";
 import { signSignatureRequest } from "../client/actions/signSignatureRequest.js";
 import { internalStateDecorator } from "../internal/decorator.js";
@@ -17,18 +11,16 @@ import type {
   InnerWalletApiClientBase,
 } from "../types.ts";
 
-export function createRemoteClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
->(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient<TAccount>;
-
 /**
  * This is a low-level client just used to make RPC requests in remote mode
  * This should be wrapped by a higher-level smart account client that provides actions
  * that uses this client under the hood
  * @returns
  */
+export function createRemoteClient<
+  TAccount extends Address | undefined = Address | undefined,
+>(params: CreateInnerClientParams<TAccount>): InnerWalletApiClient;
+
 export function createRemoteClient(
   params: CreateInnerClientParams,
 ): InnerWalletApiClient {
@@ -62,20 +54,13 @@ const innerClientActions = (
         method: "wallet_createSession",
         params: [params],
       });
-      if (signatureRequest.type !== "eth_signTypedData_v4") {
-        throw new BaseError("Unexpected signature request type");
-      }
-      const { signedAuthorization, signature } = await signSignatureRequest(
-        signer,
-        signatureRequest,
-      );
+      const signature = await signSignatureRequest(signer, signatureRequest);
       return {
         context: encodePermissionsContext({
           contextVersion: "REMOTE_MODE_DEFERRED_ACTION",
           sessionId,
-          signature,
+          signature: signature.data,
         }),
-        signedAuthorization,
       };
     },
   };

package/src/rpc/examples.ts

@@ -82,9 +82,8 @@ const SendPreparedCalls = [
             },
             chainId: "0x66eee",
             signature: {
-              type: "ecdsa",
-              signature:
-                "0xb1a055089b1ba8387ed435f2bd0afe7ff69f22b928cdfdea1b5323c64d6af387164de3fa6febf031b544de46a84d6fb7f084b9798ddfaba820950c257139a7321b",
+              type: "secp256k1",
+              data: "0xb1a055089b1ba8387ed435f2bd0afe7ff69f22b928cdfdea1b5323c64d6af387164de3fa6febf031b544de46a84d6fb7f084b9798ddfaba820950c257139a7321b",
             },
           },
         ],
@@ -200,7 +199,7 @@ const CreateSession = [
                 type: "root",
               },
             ],
-            expiry: 1747969653,
+            expirySec: 1747969653,
           },
         ],
       },

package/src/rpc/request.ts

@@ -6,15 +6,18 @@ import {
   RemotePermission,
 } from "../capabilities/permissions/index.js";
 import {
+  TypeCallArray,
+  TypePrepareCall_UserOpV060_Signed,
+  TypePrepareCall_UserOpV070_Signed,
+  PreparedCall_Authorization,
+  PreparedCall_UserOpV060,
+  PreparedCall_UserOpV070,
   TypeAddress,
   TypeBase64UrlEncodedString,
   TypeCreationOptions,
-  TypeEip7702AuthExtendedFields,
   TypeHex,
   TypeSerializedInitcode,
-  TypeSignatureRequest,
-  TypeUserOperationRequest_v6,
-  TypeUserOperationRequest_v7,
+  TypeTypedDataSignatureRequest,
   TypeUuid,
 } from "../schemas.js";
 import { Examples } from "./examples.js";
@@ -24,45 +27,22 @@ export const wallet_sendPreparedCalls = Type.Object(
     Request: Type.Object({
       method: Type.Literal("wallet_sendPreparedCalls"),
       params: Type.Tuple([
-        Type.Object({
-          type: Type.Union([
-            Type.Literal("user-operation-v060", {
-              title: "User Operation (Entrypoint v0.6.0)",
-            }),
-            Type.Literal("user-operation-v070", {
-              title: "User Operation (Entrypoint v0.7.0)",
-            }),
-          ]),
-          data: Type.Union([
-            Type.Omit(TypeUserOperationRequest_v6, ["signature"], {
-              title: "Unsigned User Operation (Entrypoint v0.6.0)",
-            }),
-            Type.Omit(TypeUserOperationRequest_v7, ["signature"], {
-              title: "Unsigned User Operation (Entrypoint v0.7.0)",
-            }),
+        Type.Intersect([
+          Type.Union([
+            TypeCallArray,
+            TypePrepareCall_UserOpV060_Signed,
+            TypePrepareCall_UserOpV070_Signed,
           ]),
-          chainId: TypeHex(),
-          signature: Type.Object({
-            type: Type.Transform(Type.Literal("ecdsa"))
-              .Decode((value) => {
-                if (value.toLowerCase() !== "ecdsa") {
-                  throw new Error("Invalid signature type, must be 'ecdsa'");
-                }
-
-                return "ecdsa" as const;
-              })
-              .Encode((value) => value),
-            signature: TypeHex(),
+          Type.Object({
+            capabilities: Type.Optional(
+              Type.Object({
+                permissions: Type.Optional(
+                  Type.Union([PermissionsContext, RemotePermission]),
+                ),
+              }),
+            ),
           }),
-          signedAuthorization: Type.Optional(TypeEip7702AuthExtendedFields),
-          capabilities: Type.Optional(
-            Type.Object({
-              permissions: Type.Optional(
-                Type.Union([PermissionsContext, RemotePermission]),
-              ),
-            }),
-          ),
-        }),
+        ]),
       ]),
     }),
     ReturnType: Type.Object({
@@ -95,26 +75,23 @@ export const wallet_prepareCalls = Type.Object(
         }),
       ]),
     }),
-    ReturnType: Type.Object({
-      type: Type.Union([
-        Type.Literal("user-operation-v060", {
-          title: "User Operation (Entrypoint v0.6.0)",
-        }),
-        Type.Literal("user-operation-v070", {
-          title: "User Operation (Entrypoint v0.7.0)",
-        }),
-      ]),
-      data: Type.Union([
-        Type.Omit(TypeUserOperationRequest_v6, ["signature"], {
-          title: "Unsigned User Operation (Entrypoint v0.6.0)",
-        }),
-        Type.Omit(TypeUserOperationRequest_v7, ["signature"], {
-          title: "Unsigned User Operation (Entrypoint v0.7.0)",
-        }),
-      ]),
-      chainId: TypeHex(),
-      signatureRequest: TypeSignatureRequest,
-    }),
+    ReturnType: Type.Union([
+      Type.Object(
+        {
+          type: Type.Literal("array"),
+          data: Type.Array(
+            Type.Union([
+              PreparedCall_UserOpV060,
+              PreparedCall_UserOpV070,
+              PreparedCall_Authorization,
+            ]),
+          ),
+        },
+        { description: "Array of prepared calls" },
+      ),
+      PreparedCall_UserOpV060,
+      PreparedCall_UserOpV070,
+    ]),
   },
   {
     description:
@@ -139,7 +116,7 @@ export const wallet_requestAccount = Type.Object(
               ),
             },
             {
-              title: "Using signer address",
+              description: "Using signer address",
             },
           ),
           Type.Object(
@@ -150,7 +127,7 @@ export const wallet_requestAccount = Type.Object(
               ),
             },
             {
-              title: "Using smart contract account address",
+              description: "Using smart contract account address",
             },
           ),
         ]),
@@ -241,7 +218,7 @@ export const wallet_createSession = Type.Object(
     }),
     ReturnType: Type.Object({
       sessionId: TypeHex(),
-      signatureRequest: TypeSignatureRequest,
+      signatureRequest: TypeTypedDataSignatureRequest,
     }),
   },
   {

package/src/rpc/schema.ts

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