fix: change imports to all 4337 sdk

Author: cpb8010

packages/auth-server/composables/useConfigurableAccount.ts

@@ -1,20 +1,20 @@
 import type { Address } from "viem";
-import { fetchAccount } from "zksync-sso/client";
+import { fetchAccount } from "zksync-sso-4337";
 import { WebAuthnValidatorAbi } from "zksync-sso-4337/abi";
 
 export const useConfigurableAccount = () => {
-  const { getPublicClient, getConfigurableClient, defaultChain } = useClientStore();
+  const { getPublicClient, getConfigurableClient, defaultChain, contractsByChain } = useClientStore();
 
   const { inProgress: getConfigurableAccountInProgress, error: getConfigurableAccountError, execute: getConfigurableAccount } = useAsync(async ({ address }: { address: Address }) => {
     const publicClient = getPublicClient({ chainId: defaultChain.id });
-    const factoryAddress = contractsByChain[defaultChain.id].accountFactory;
+    const webauthnValidatorAddress = contractsByChain[defaultChain.id].webauthnValidator;
 
     // FIXME: events should be scoped to the origin domain
     // As well, this doesn't seem to be a reliable way of retrieving a `credentialId`
     // but works for now.
     const [events, removedEvents] = await Promise.all([
       publicClient.getContractEvents({
-        address: factoryAddress,
+        address: webauthnValidatorAddress,
         abi: WebAuthnValidatorAbi,
         eventName: "PasskeyCreated",
         args: {
@@ -24,7 +24,7 @@ export const useConfigurableAccount = () => {
         strict: true,
       }),
       publicClient.getContractEvents({
-        address: factoryAddress,
+        address: webauthnValidatorAddress,
         abi: WebAuthnValidatorAbi,
         eventName: "PasskeyRemoved",
         args: {
@@ -52,17 +52,19 @@ export const useConfigurableAccount = () => {
 
     const latestEvent = activeEvents[activeEvents.length - 1];
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const { username, passkeyPublicKey } = await fetchAccount(publicClient as any, {
-      contracts: contractsByChain[defaultChain.id],
-      uniqueAccountId: latestEvent.args.credentialId,
+    const { credentialId } = await fetchAccount({
+      client: publicClient,
+      contracts: {
+        webauthnValidator: webauthnValidatorAddress,
+      },
+      originDomain: window.location.origin,
+      credentialId: latestEvent.args.credentialId,
     });
 
     return getConfigurableClient({
       chainId: defaultChain.id,
       address,
-      credentialPublicKey: passkeyPublicKey,
-      username,
+      credentialId,
     });
   });
 

packages/sdk-4337/src/client/actions/index.ts

@@ -21,10 +21,12 @@ export { getAccountAddressFromLogs, prepareDeploySmartAccount } from "./deploy.j
 export type {
   AddPasskeyParams,
   AddPasskeyResult,
+  FetchAccountParams,
+  FetchAccountResult,
   FindAddressesByPasskeyParams,
   FindAddressesByPasskeyResult,
 } from "./passkey.js";
-export { addPasskey, findAddressesByPasskey } from "./passkey.js";
+export { addPasskey, fetchAccount, findAddressesByPasskey } from "./passkey.js";
 
 // Utilities
 export { generateAccountId } from "./utils.js";

packages/sdk-4337/src/client/actions/passkey.ts

@@ -1,12 +1,16 @@
 import type { Address, Hex, PublicClient } from "viem";
-import { hexToBytes } from "viem";
+import { hexToBytes, toHex } from "viem";
+import { readContract } from "viem/actions";
 import {
   decode_get_account_list_result,
   encode_add_passkey_call_data,
   encode_get_account_list_call_data,
   PasskeyPayload,
 } from "zksync-sso-web-sdk/bundler";
 
+import { WebAuthnValidatorAbi } from "../../abi/WebAuthnValidator.js";
+import { base64urlToUint8Array } from "../passkey/webauthn.js";
+
 /**
  * Parameters for adding a passkey to a smart account
  */
@@ -197,3 +201,144 @@ export async function findAddressesByPasskey(
 
   return { addresses };
 }
+
+/**
+ * Parameters for fetching account details by passkey
+ */
+export type FetchAccountParams = {
+  /** Public client for making RPC calls */
+  client: PublicClient;
+
+  /** Contract addresses */
+  contracts: {
+    /** WebAuthn validator address */
+    webauthnValidator: Address;
+  };
+
+  /** Origin domain (e.g., "https://example.com" or window.location.origin) */
+  originDomain: string;
+
+  /** Optional: credential ID if known, otherwise will prompt user */
+  credentialId?: string;
+};
+
+/**
+ * Result from fetching account details
+ */
+export type FetchAccountResult = {
+  /** Credential ID (username) */
+  credentialId: string;
+  /** Smart account address */
+  address: Address;
+  /** Passkey public key as Uint8Array (COSE format) */
+  passkeyPublicKey: Uint8Array;
+};
+
+/**
+ * Fetch account details for a passkey credential.
+ * If credentialId is not provided, will prompt the user to select a passkey.
+ * This queries the WebAuthnValidator contract to get the account address and public key.
+ *
+ * @param params - Parameters including client, validator address, and optional credential ID
+ * @returns Account details including credentialId, address, and public key
+ *
+ * @example
+ * ```typescript
+ * import { createPublicClient, http } from "viem";
+ * import { fetchAccount } from "zksync-sso-4337/actions";
+ *
+ * const publicClient = createPublicClient({
+ *   chain: zkSyncSepoliaTestnet,
+ *   transport: http(),
+ * });
+ *
+ * const { credentialId, address, passkeyPublicKey } = await fetchAccount({
+ *   client: publicClient,
+ *   contracts: {
+ *     webauthnValidator: "0x...",
+ *   },
+ *   originDomain: window.location.origin,
+ * });
+ *
+ * console.log(`Account address: ${address}`);
+ * ```
+ */
+export async function fetchAccount(
+  params: FetchAccountParams,
+): Promise<FetchAccountResult> {
+  const { client, contracts, originDomain, credentialId: providedCredentialId } = params;
+
+  let credentialId = providedCredentialId;
+
+  // If no credential ID provided, prompt user to select a passkey
+  if (!credentialId) {
+    const credential = (await navigator.credentials.get({
+      publicKey: {
+        challenge: new Uint8Array(32), // Dummy challenge
+        userVerification: "discouraged",
+      },
+    })) as PublicKeyCredential | null;
+
+    if (!credential) {
+      throw new Error("No passkey credential selected");
+    }
+
+    credentialId = credential.id;
+  }
+
+  // Convert credential ID to hex
+  const credentialIdHex = toHex(base64urlToUint8Array(credentialId));
+
+  // Get account list for this credential
+  const { addresses } = await findAddressesByPasskey({
+    client,
+    contracts,
+    passkey: {
+      credentialId: credentialIdHex,
+      originDomain,
+    },
+  });
+
+  if (addresses.length === 0) {
+    throw new Error(`No account found for credential ID: ${credentialId}`);
+  }
+
+  // Get the first account (most common case is one account per passkey)
+  const address = addresses[0];
+
+  // Get the public key for this account
+  const publicKeyCoords = await readContract(client, {
+    abi: WebAuthnValidatorAbi,
+    address: contracts.webauthnValidator,
+    functionName: "getAccountKey",
+    args: [originDomain, credentialIdHex, address],
+  });
+
+  if (!publicKeyCoords || !publicKeyCoords[0] || !publicKeyCoords[1]) {
+    throw new Error(`Passkey credentials not found in on-chain module for passkey ${credentialId}`);
+  }
+
+  // Convert the public key coordinates back to COSE format
+  // The coordinates are returned as bytes32[2], we need to convert them to a COSE public key
+  // For now, we'll return them as a simple concatenated Uint8Array
+  // This matches what the legacy SDK's getPasskeySignatureFromPublicKeyBytes expects
+  const xBytes = hexToBytes(publicKeyCoords[0]);
+  const yBytes = hexToBytes(publicKeyCoords[1]);
+
+  // Create COSE-encoded public key (simplified version)
+  // This is a minimal CBOR map encoding for ES256 key
+  const coseKey = new Uint8Array([
+    0xa5, // Map with 5 items
+    0x01, 0x02, // kty: 2 (EC2)
+    0x03, 0x26, // alg: -7 (ES256)
+    0x20, 0x01, // crv: 1 (P-256)
+    0x21, 0x58, 0x20, ...xBytes, // x: 32-byte coordinate
+    0x22, 0x58, 0x20, ...yBytes, // y: 32-byte coordinate
+  ]);
+
+  return {
+    credentialId,
+    address,
+    passkeyPublicKey: coseKey,
+  };
+}

packages/sdk-4337/src/index.ts

@@ -9,3 +9,4 @@ export * from "./errors/index.js";
 
 // Re-export actions
 export * from "./actions/sendUserOperation.js";
+export * from "./client/actions/index.js";