@account-kit/wallet-client 0.1.0-alpha.3 → 0.1.0-alpha.5

package/src/isomorphic/utils/parsePermissionsContext.ts

@@ -2,33 +2,33 @@ import type { StaticDecode } from "@sinclair/typebox";
 import { InvalidRequestError } from "ox/RpcResponse";
 import { decodePermissionsContext } from "../../capabilities/permissions/mav2.js";
 import type { TypeSerializedInitcode } from "../../schemas.js";
-import type { PrepareCallsParams } from "../actions/prepareCalls.js";
 import type { Address } from "viem";
-import { getAccountTypeForImplementationAddress7702 } from "./7702.js";
+import { getAccountTypeForDelegationAddress7702 } from "./7702.js";
+import { PermissionsCapability } from "../../capabilities/permissions/index.js";
 
 export function parsePermissionsContext(
-  capabilities: PrepareCallsParams["capabilities"],
-  parsedCi: StaticDecode<typeof TypeSerializedInitcode> | undefined,
+  permissions?: StaticDecode<typeof PermissionsCapability>,
+  parsedCi?: StaticDecode<typeof TypeSerializedInitcode> | undefined,
   delegation7702?: Address,
 ) {
-  if (!capabilities?.permissions) {
+  if (!permissions) {
     return undefined;
   }
 
-  if ("sessionId" in capabilities.permissions) {
+  if ("sessionId" in permissions) {
     throw new InvalidRequestError({
       message: "Remote permissions are not supported in isomorphic client",
     });
   }
 
-  if (!("context" in capabilities.permissions)) {
+  if (!("context" in permissions)) {
     return undefined;
   }
 
   const isMAV2 =
     (parsedCi && parsedCi.factoryType === "MAv2.0.0-sma-b") ||
     (delegation7702 &&
-      getAccountTypeForImplementationAddress7702(delegation7702) ===
+      getAccountTypeForDelegationAddress7702(delegation7702) ===
         "ModularAccountV2");
 
   if (!isMAV2) {
@@ -37,7 +37,7 @@ export function parsePermissionsContext(
     });
   }
 
-  const context = decodePermissionsContext(capabilities.permissions);
+  const context = decodePermissionsContext(permissions);
 
   if (context?.contextVersion === "REMOTE_MODE_DEFERRED_ACTION") {
     throw new InvalidRequestError({

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,

package/src/remote/client.ts

@@ -1,11 +1,5 @@
 import { Provider } from "ox";
-import {
-  BaseError,
-  createClient,
-  custom,
-  type Address,
-  type JsonRpcAccount,
-} from "viem";
+import { BaseError, 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 {

package/src/rpc/request.ts

@@ -16,8 +16,10 @@ import {
   TypeUserOperationRequest_v6,
   TypeUserOperationRequest_v7,
   TypeUuid,
+  TypeSignatureType,
 } from "../schemas.js";
 import { Examples } from "./examples.js";
+import { Eip7702AuthCapability } from "../capabilities/eip7702Auth.js";
 
 export const wallet_sendPreparedCalls = Type.Object(
   {
@@ -43,15 +45,7 @@ export const wallet_sendPreparedCalls = Type.Object(
           ]),
           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),
+            type: Type.Exclude(TypeSignatureType, Type.Literal("contract")),
             signature: TypeHex(),
           }),
           signedAuthorization: Type.Optional(TypeEip7702AuthExtendedFields),
@@ -235,6 +229,11 @@ export const wallet_createSession = Type.Object(
           PermissionsData,
           Type.Object({
             account: TypeAddress,
+            capabilities: Type.Optional(
+              Type.Object({
+                eip7702Auth: Type.Optional(Eip7702AuthCapability),
+              }),
+            ),
           }),
         ]),
       ]),

package/src/schemas.ts

@@ -287,11 +287,15 @@ export type TypeAccountType = Exclude<
   undefined
 >["accountType"];
 
+export const TypeSignatureType = Type.Union([
+  Type.Literal("secp256k1", { title: "Secp256k1" }),
+  Type.Literal("ecdsa", { title: "ECDSA (alias for secp256k1)" }),
+  Type.Literal("contract", { title: "Contract" }),
+]);
+export type TypeSignatureType = Static<typeof TypeSignatureType>;
+
 export const KeySigner = Type.Object({
-  type: Type.Union([
-    Type.Literal("secp256k1", { title: "Secp256k1" }),
-    Type.Literal("contract", { title: "Contract" }),
-  ]),
+  type: TypeSignatureType,
   publicKey: TypeHex({}),
 });
 export type KeySigner = Static<typeof KeySigner>;

package/src/types.ts

@@ -5,7 +5,6 @@ import type {
   Chain,
   Client,
   Hex,
-  IsUndefined,
   JsonRpcAccount,
   Transport,
 } from "viem";
@@ -17,32 +16,22 @@ import type { RequestAccountParams } from "./client/actions/requestAccount.ts";
 import type { WalletServerViemRpcSchema } from "./rpc/schema.ts";
 
 export type CreateInnerClientParams<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
+  TAccount extends Address | undefined = Address | undefined,
 > = {
   chain: Chain;
   transport: AlchemyTransport;
   policyId?: string;
-} & (IsUndefined<TAccount> extends true
-  ? {
-      account?: never;
-    }
-  : {
-      account: Address;
-    });
+  account?: TAccount | Address | undefined;
+};
 
 export type InnerWalletApiClientBase<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
   TExtend extends { [key: string]: unknown } | undefined =
     | { [key: string]: unknown }
     | undefined,
 > = Client<
   Transport,
   Chain,
-  TAccount,
+  JsonRpcAccount<Address> | undefined,
   WalletServerViemRpcSchema,
   { policyId?: string } & TExtend
 >;
@@ -64,11 +53,6 @@ export type InternalState = {
   getAccount: () => CachedAccount | undefined;
 };
 
-export type InnerWalletApiClient<
-  TAccount extends JsonRpcAccount<Address> | undefined =
-    | JsonRpcAccount<Address>
-    | undefined,
-> = InnerWalletApiClientBase<
-  TAccount,
+export type InnerWalletApiClient = InnerWalletApiClientBase<
   InnerClientActions & { internal: InternalState }
 >;