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

package/src/schemas.ts

@@ -4,7 +4,18 @@ import {
   type SchemaOptions,
   type Static,
 } from "@sinclair/typebox";
-import { toHex, slice, pad, concat, hexToBigInt } from "viem";
+import { yParityToV } from "ox/Signature";
+import {
+  toHex,
+  slice,
+  pad,
+  concat,
+  hexToBigInt,
+  serializeSignature,
+  hexToNumber,
+  parseSignature,
+  numberToHex,
+} from "viem";
 
 const UUID_V4_REGEX =
   /^[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
@@ -42,10 +53,10 @@ export const TypeUserOperationRequest_v6 = Type.Object({
   nonce: TypeHex(),
   initCode: Type.Union([
     TypeHex({
-      title: "Present",
+      description: "Present",
     }),
     Type.Literal("0x", {
-      title: "Absent",
+      description: "Absent",
     }),
   ]),
   callData: TypeHex(),
@@ -56,10 +67,10 @@ export const TypeUserOperationRequest_v6 = Type.Object({
   maxPriorityFeePerGas: TypeHex(),
   paymasterAndData: Type.Union([
     TypeHex({
-      title: "Present",
+      description: "Present",
     }),
     Type.Literal("0x", {
-      title: "Absent",
+      description: "Absent",
     }),
   ]),
   signature: TypeHex(),
@@ -83,21 +94,21 @@ export const TypeUserOperationRequest_v7 = Type.Object({
   signature: TypeHex(),
 });
 
-export const TypeEip7702AuthRequest = Type.Object({
-  chainId: Type.Integer(),
-  address: TypeAddress,
-  nonce: Type.Integer(),
-});
-
-export const TypeEip7702AuthExtendedFields = Type.Object({
+export const TypeEip7702UnsignedAuth = Type.Object({
   chainId: TypeHex(),
-  nonce: TypeHex(),
   address: TypeAddress,
-  r: TypeHex(),
-  s: TypeHex(),
-  yParity: TypeHex(),
+  nonce: TypeHex(),
 });
 
+export const TypeEip7702SignedAuth = Type.Intersect([
+  TypeEip7702UnsignedAuth,
+  Type.Object({
+    r: TypeHex(),
+    s: TypeHex(),
+    yParity: TypeHex(),
+  }),
+]);
+
 export const TypeWebAuthnPublicKey = Type.Object({
   x: TypeU256,
   y: TypeU256,
@@ -108,11 +119,13 @@ export const TypePersistedInitcode = Type.Object({
   initcode: Type.Union([
     Type.Object(
       {
-        factoryType: Type.Literal("unknown", { title: "Unknown factory type" }),
+        factoryType: Type.Literal("unknown", {
+          description: "Unknown factory type",
+        }),
         factoryData: TypeHex({}),
       },
       {
-        title: "Unknown factory type",
+        description: "Unknown factory type",
       },
     ),
     Type.Object(
@@ -127,7 +140,7 @@ export const TypePersistedInitcode = Type.Object({
         initialOwner: TypeAddress,
       },
       {
-        title: "Light Account",
+        description: "Light Account",
       },
     ),
     Type.Object(
@@ -140,7 +153,7 @@ export const TypePersistedInitcode = Type.Object({
         initialOwners: Type.Array(TypeAddress),
       },
       {
-        title: "Multi-Owner Modular Account",
+        description: "Multi-Owner Modular Account",
       },
     ),
     Type.Object(
@@ -151,7 +164,7 @@ export const TypePersistedInitcode = Type.Object({
         threshold: TypeU256,
       },
       {
-        title: "Multi-Sig Modular Account",
+        description: "Multi-Sig Modular Account",
       },
     ),
     Type.Intersect([
@@ -167,7 +180,7 @@ export const TypePersistedInitcode = Type.Object({
             entityId: TypeU32,
           },
           {
-            title: "Modular Account V2 SSV",
+            description: "Modular Account V2 SSV",
           },
         ),
         Type.Object(
@@ -176,7 +189,7 @@ export const TypePersistedInitcode = Type.Object({
             initialOwner: TypeAddress,
           },
           {
-            title: "Modular Account V2 SMA-B",
+            description: "Modular Account V2 SMA-B",
           },
         ),
         Type.Object(
@@ -186,7 +199,7 @@ export const TypePersistedInitcode = Type.Object({
             entityId: TypeU32,
           },
           {
-            title: "Modular Account V2 WebAuthn",
+            description: "Modular Account V2 WebAuthn",
           },
         ),
       ]),
@@ -196,29 +209,29 @@ export const TypePersistedInitcode = Type.Object({
 
 export const TypeSerializedInitcode = Type.Object({
   factoryType: Type.Union([
-    Type.Literal("LightAccountV1.0.1", { title: "Light Account v1.0.1" }),
-    Type.Literal("LightAccountV1.0.2", { title: "Light Account v1.0.2" }),
-    Type.Literal("LightAccountV1.1.0", { title: "Light Account v1.1.0" }),
-    Type.Literal("LightAccountV2.0.0", { title: "Light Account v2.0.0" }),
+    Type.Literal("LightAccountV1.0.1", { description: "Light Account v1.0.1" }),
+    Type.Literal("LightAccountV1.0.2", { description: "Light Account v1.0.2" }),
+    Type.Literal("LightAccountV1.1.0", { description: "Light Account v1.1.0" }),
+    Type.Literal("LightAccountV2.0.0", { description: "Light Account v2.0.0" }),
     Type.Literal("LightAccountV2.0.0-MultiOwner", {
-      title: "Light Account v2.0.0 MultiOwner",
+      description: "Light Account v2.0.0 MultiOwner",
     }),
     Type.Literal("MAv1.0.0-MultiOwner", {
-      title: "Modular Account v1.0.0 MultiOwner",
+      description: "Modular Account v1.0.0 MultiOwner",
     }),
     Type.Literal("MAv1.0.0-MultiSig", {
-      title: "Modular Account v1.0.0 MultiSig",
+      description: "Modular Account v1.0.0 MultiSig",
     }),
     Type.Literal("MAv2.0.0-sma-b", {
-      title: "Modular Account v2.0.0 SMA-B",
+      description: "Modular Account v2.0.0 SMA-B",
     }),
     Type.Literal("MAv2.0.0-ma-ssv", {
-      title: "Modular Account v2.0.0 SSV",
+      description: "Modular Account v2.0.0 SSV",
     }),
     Type.Literal("MAv2.0.0-ma-webauthn", {
-      title: "Modular Account v2.0.0 WebAuthn",
+      description: "Modular Account v2.0.0 WebAuthn",
     }),
-    Type.Literal("unknown", { title: "Unknown factory type" }),
+    Type.Literal("unknown", { description: "Unknown factory type" }),
   ]),
   factoryAddress: TypeAddress,
   factoryData: TypeHex({}),
@@ -237,7 +250,7 @@ export const TypeCounterfactualInfo = Type.Intersect([
         TypePersistedInitcode,
       ],
       {
-        title: "Smart Contract Account",
+        description: "Smart Contract Account",
       },
     ),
     Type.Object(
@@ -246,7 +259,7 @@ export const TypeCounterfactualInfo = Type.Intersect([
         implementationAddress: TypeAddress,
       },
       {
-        title: "7702 Account",
+        description: "7702 Account",
       },
     ),
   ]),
@@ -262,7 +275,7 @@ export const TypeCreationOptions = Type.Optional(
         salt: Type.Optional(TypeHex()),
       },
       {
-        title: "SMA-B account type",
+        description: "SMA-B account type",
       },
     ),
     Type.Object(
@@ -275,7 +288,7 @@ export const TypeCreationOptions = Type.Optional(
         // delegation: TypeAddress,
       },
       {
-        title: "7702 account type",
+        description: "7702 account type",
       },
     ),
   ]),
@@ -287,11 +300,15 @@ export type TypeAccountType = Exclude<
   undefined
 >["accountType"];
 
+export const TypeSignatureType = Type.Union([
+  Type.Literal("secp256k1", { description: "Secp256k1" }),
+  Type.Literal("ecdsa", { description: "ECDSA (alias for secp256k1)" }),
+  Type.Literal("contract", { description: "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>;
@@ -342,37 +359,40 @@ export const TTypedDataDefinition = Type.Transform(
     };
   });
 
-const TypePersonalSignSignatureRequest = Type.Object(
+export const TypePersonalSignSignatureRequest = Type.Object(
   {
     type: Type.Literal("personal_sign"),
     data: Type.Union([
-      Type.String({ minLength: 1, title: "Message" }),
+      Type.String({ minLength: 1, description: "Message" }),
       Type.Object(
         {
           raw: TypeHex(),
         },
-        { title: "Raw message" },
+        { description: "Raw message" },
       ),
     ]),
   },
-  { title: "Personal sign" },
+  { description: "Personal sign" },
 );
 
-const TypeTypedDataSignatureRequest = Type.Object(
+export const TypeTypedDataSignatureRequest = Type.Object(
   {
     type: Type.Literal("eth_signTypedData_v4"),
     data: TTypedDataDefinition,
   },
   {
-    title: "Typed data",
+    description: "Typed data",
   },
 );
 
-export const TypeSignatureRequest = Type.Intersect([
-  Type.Union([TypePersonalSignSignatureRequest, TypeTypedDataSignatureRequest]),
-  Type.Object({
-    authorizationRequest: Type.Optional(TypeEip7702AuthRequest),
-  }),
+export const TypeAuthorizationSignatureRequest = Type.Object({
+  type: Type.Literal("eip7702Auth"),
+});
+
+export const TypeSignatureRequest = Type.Union([
+  TypePersonalSignSignatureRequest,
+  TypeTypedDataSignatureRequest,
+  TypeAuthorizationSignatureRequest,
 ]);
 
 export const TypeCallId = Type.Transform(TypeHex())
@@ -386,3 +406,161 @@ export const TypeCallId = Type.Transform(TypeHex())
     const chainIdPadded = pad(chainId, { size: 32 });
     return concat([chainIdPadded, hash]);
   });
+
+export const PreparedCall_UserOpV060 = Type.Object(
+  {
+    type: Type.Literal("user-operation-v060", {
+      description: "User Operation (Entrypoint v0.6.0)",
+    }),
+    data: Type.Omit(TypeUserOperationRequest_v6, ["signature"], {
+      description: "Unsigned User Operation (Entrypoint v0.6.0)",
+    }),
+    chainId: TypeHex(),
+    signatureRequest: Type.Union([
+      TypePersonalSignSignatureRequest,
+      TypeTypedDataSignatureRequest,
+    ]),
+  },
+  {
+    description: "Prepared User Operation (Entrypoint v0.6.0)",
+  },
+);
+
+export const PreparedCall_UserOpV070 = Type.Object(
+  {
+    type: Type.Literal("user-operation-v070", {
+      description: "User Operation (Entrypoint v0.7.0)",
+    }),
+    data: Type.Omit(TypeUserOperationRequest_v7, ["signature"], {
+      description: "Unsigned User Operation (Entrypoint v0.7.0)",
+    }),
+    chainId: TypeHex(),
+    signatureRequest: Type.Union([
+      TypePersonalSignSignatureRequest,
+      TypeTypedDataSignatureRequest,
+    ]),
+  },
+  {
+    description: "Prepared User Operation (Entrypoint v0.7.0)",
+  },
+);
+
+export const PreparedCall_Authorization = Type.Object(
+  {
+    type: Type.Literal("authorization", {
+      description: "EIP-7702 Authorization Request",
+    }),
+    data: Type.Omit(TypeEip7702UnsignedAuth, ["chainId"]),
+    chainId: TypeHex(),
+    signatureRequest: TypeAuthorizationSignatureRequest,
+  },
+  {
+    description: "Prepared EIP-7702 Authorization",
+  },
+);
+
+export const TypeEdcsaSigData = Type.Union([
+  TypeHex({
+    description: "Hex-encoded signature",
+  }),
+  Type.Transform(
+    Type.Object(
+      {
+        r: TypeHex(),
+        s: TypeHex(),
+        yParity: TypeHex(),
+      },
+      { description: "r, s, yParity" },
+    ),
+  )
+    .Decode((sig) =>
+      serializeSignature({ ...sig, yParity: hexToNumber(sig.yParity) }),
+    )
+    .Encode((hex) => {
+      const parsed = parseSignature(hex);
+      return {
+        ...parsed,
+        yParity: numberToHex(parsed.yParity),
+      };
+    }),
+  Type.Transform(
+    Type.Object(
+      {
+        r: TypeHex(),
+        s: TypeHex(),
+        v: TypeHex(),
+      },
+      {
+        description: "r, s, v",
+      },
+    ),
+  )
+    .Decode((sig) => serializeSignature({ ...sig, v: hexToBigInt(sig.v) }))
+    .Encode((hex) => {
+      const parsed = parseSignature(hex);
+      return {
+        ...parsed,
+        v: numberToHex(yParityToV(parsed.yParity)),
+      };
+    }),
+]);
+
+export const TypeEcdsaSig = Type.Object({
+  signature: Type.Union([
+    Type.Object(
+      {
+        type: Type.Literal("secp256k1"),
+        data: TypeEdcsaSigData,
+      },
+      {
+        description: "Secp256k1 signature",
+      },
+    ),
+    Type.Object(
+      {
+        type: Type.Literal("ecdsa"),
+        data: TypeEdcsaSigData,
+      },
+      {
+        description: "ECDSA signature (alias for secp256k1)",
+      },
+    ),
+  ]),
+});
+
+export const TypePrepareCall_UserOpV060_Signed = Type.Intersect(
+  [Type.Omit(PreparedCall_UserOpV060, ["signatureRequest"]), TypeEcdsaSig],
+  {
+    description: "Prepared User Operation (Entrypoint v0.6.0) with signature",
+  },
+);
+
+export const TypePrepareCall_UserOpV070_Signed = Type.Intersect(
+  [Type.Omit(PreparedCall_UserOpV070, ["signatureRequest"]), TypeEcdsaSig],
+  {
+    description: "Prepared User Operation (Entrypoint v0.7.0) with signature",
+  },
+);
+
+export const TypePrepareCall_Authorization_Signed = Type.Intersect(
+  [Type.Omit(PreparedCall_Authorization, ["signatureRequest"]), TypeEcdsaSig],
+  {
+    description: "Prepared EIP-7702 Authorization with signature",
+  },
+);
+
+export const TypeCallArray = Type.Object(
+  {
+    type: Type.Literal("array"),
+    data: Type.Array(
+      Type.Union([
+        TypePrepareCall_UserOpV060_Signed,
+        TypePrepareCall_UserOpV070_Signed,
+        TypePrepareCall_Authorization_Signed,
+      ]),
+    ),
+  },
+  {
+    description: "Array of prepared calls with signatures",
+  },
+);

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,10 @@ 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 }
 >;
+
+export type WithoutChainId<T> = T extends { chainId: Hex }
+  ? Omit<T, "chainId">
+  : T;