@zerodev/wallet-core 0.0.1-alpha.3 → 0.0.1-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/wallet-core",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.5",
   "description": "ZeroDev Wallet SDK built on Turnkey",
   "main": "./dist/_cjs/index.js",
   "module": "./dist/_esm/index.js",
@@ -55,11 +55,11 @@
     "@turnkey/webauthn-stamper": "^0.6.0"
   },
   "peerDependencies": {
-    "viem": "2.37.6"
+    "viem": "^2.38.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",
-    "typescript": "~5.9.0"
+    "typescript": "5.9.3"
   },
   "scripts": {
     "build": "pnpm run clean && pnpm run build:cjs && pnpm run build:esm && pnpm run build:types",

package/src/actions/auth/loginWithStamp.ts

@@ -1,4 +1,5 @@
 import type { Client } from '../../client/types.js'
+import type { Stamp } from '../../stampers/types.js'
 
 export type EmailCustomization = {
   /** A template for the URL to be used in a magic link button, e.g. `https://dapp.xyz/%s`. The auth bundle will be interpolated into the `%s`. */
@@ -12,6 +13,8 @@ export type LoginWithStampParameters = {
   organizationId: string
   /** The encoded public key for the request */
   targetPublicKey: string
+  /** The stamper type for the request */
+  stampWith?: 'indexedDb' | 'webauthn'
 }
 
 export type LoginWithStampReturnType = {
@@ -39,7 +42,7 @@ export async function loginWithStamp(
   client: Client,
   params: LoginWithStampParameters,
 ): Promise<LoginWithStampReturnType> {
-  const { projectId, targetPublicKey, organizationId } = params
+  const { projectId, targetPublicKey, organizationId, stampWith } = params
 
   const timestampMs = Date.now()
   const timestampMsString = timestampMs.toString()
@@ -53,7 +56,14 @@ export async function loginWithStamp(
     timestampMs: timestampMsString,
     type: 'ACTIVITY_TYPE_STAMP_LOGIN',
   })}\n`
-  const stamp = await client.stamper.stamp(stampPayload)
+  let stamp: Stamp
+  if (stampWith === 'indexedDb') {
+    stamp = await client.indexedDbStamper.stamp(stampPayload)
+  } else if (stampWith === 'webauthn') {
+    stamp = await client.webauthnStamper.stamp(stampPayload)
+  } else {
+    stamp = await client.indexedDbStamper.stamp(stampPayload)
+  }
 
   return client.request({
     path: `${projectId}/auth/login/passkey`,

package/src/actions/wallet/getUserWallet.ts

@@ -6,11 +6,13 @@ export type GetUserWalletParameters = {
   organizationId: string
   /** The project ID for the request */
   projectId: string
+  /** The token for the request */
+  token: string
 }
 
 export type GetUserWalletReturnType = {
   /** The wallet address */
-  walletAddress: Hex
+  walletAddresses: Hex[]
   /** The user ID */
   userId?: string
 }
@@ -28,19 +30,24 @@ export type GetUserWalletReturnType = {
  *   organizationId: 'org_123',
  *   projectId: 'proj_456'
  * });
- * console.log(wallet.walletAddress); // '0x...'
+ * console.log(wallet.walletAddresses); // ['0x...', '0x...']
  * ```
  */
 export async function getUserWallet(
   client: Client,
   params: GetUserWalletParameters,
 ): Promise<GetUserWalletReturnType> {
-  const { organizationId, projectId } = params
+  const { organizationId, projectId, token } = params
 
   return await client.request({
     path: `${projectId}/user-wallet`,
     body: {
       organizationId,
     },
+    headers: {
+      Authorization: `Bearer ${token}`,
+    },
+    stamp: true,
+    stampPostion: 'headers',
   })
 }

package/src/adapters/viem.ts

@@ -24,12 +24,13 @@ export interface ToViemAccountParams {
   client: ZeroDevWalletClient
   organizationId: string
   projectId: string
+  token: string
 }
 
 export async function toViemAccount(
   params: ToViemAccountParams,
 ): Promise<LocalAccount> {
-  const { client, organizationId, projectId } = params
+  const { client, organizationId, projectId, token } = params
 
   let address: Hex = zeroAddress
 
@@ -37,8 +38,9 @@ export async function toViemAccount(
     const walletResponse = await client.getUserWallet({
       organizationId,
       projectId,
+      token,
     })
-    address = walletResponse.walletAddress
+    address = walletResponse.walletAddresses[0]
   } catch {
     address = zeroAddress
   }
@@ -71,7 +73,7 @@ export async function toViemAccount(
         ? { ...transaction, sidecars: false }
         : transaction
 
-    const serializedTx = serializer(signableTransaction)
+    const serializedTx = await serializer(signableTransaction)
     const nonHexPrefixedSerializedTx = serializedTx.replace(/^0x/, '')
     const signature = await client.signTransaction({
       organizationId,

package/src/client/createClient.ts

@@ -1,4 +1,3 @@
-import type { Stamper } from '../stampers/types.js'
 import {
   type ZeroDevWalletActions,
   zeroDevWalletActions,
@@ -14,11 +13,11 @@ let clientId = 0
  */
 export function createBaseClient<
   extended extends Record<string, unknown> | undefined = undefined,
-  TStamper extends Stamper = Stamper,
->(config: ClientConfig): Client<extended, TStamper> {
+>(config: ClientConfig): Client<extended> {
   const {
     transport,
-    stamper,
+    indexedDbStamper,
+    webauthnStamper,
     organizationId,
     key = 'zeroDevWallet',
     name = 'ZeroDev Wallet Client',
@@ -30,7 +29,8 @@ export function createBaseClient<
     request,
     value,
   } = transport({
-    stamper,
+    indexedDbStamper,
+    webauthnStamper,
   })
   const transportInstance = { ...transportConfig, ...value }
 
@@ -39,7 +39,8 @@ export function createBaseClient<
   const client = {
     transport: transportInstance,
     request,
-    stamper,
+    indexedDbStamper,
+    webauthnStamper,
     organizationId,
     key,
     name,
@@ -65,16 +66,12 @@ export function createBaseClient<
     }
   }
 
-  return Object.assign(client, { extend: extend(client) as any }) as Client<
-    extended,
-    TStamper
-  >
+  return Object.assign(client, {
+    extend: extend(client) as any,
+  }) as Client<extended>
 }
 
-export type ZeroDevWalletClient<TStamper extends Stamper = Stamper> = Client<
-  ZeroDevWalletActions,
-  TStamper
->
+export type ZeroDevWalletClient = Client<ZeroDevWalletActions>
 
 /**
  * Creates a ZeroDev Wallet client with ZeroDev Wallet actions pre-loaded.
@@ -82,14 +79,12 @@ export type ZeroDevWalletClient<TStamper extends Stamper = Stamper> = Client<
  *
  * For a client without pre-loaded actions, use createBaseClient().
  */
-export function createClient<TStamper extends Stamper = Stamper>(
-  config: ClientConfig<TStamper>,
-): ZeroDevWalletClient<TStamper> {
+export function createClient(config: ClientConfig): ZeroDevWalletClient {
   const { key = 'zeroDevWallet', name = 'ZeroDev Wallet Client' } = config
   const client = createBaseClient({
     ...config,
     key,
     name,
   })
-  return client.extend(zeroDevWalletActions) as ZeroDevWalletClient<TStamper>
+  return client.extend(zeroDevWalletActions) as ZeroDevWalletClient
 }

package/src/client/transports/createTransport.ts

@@ -26,13 +26,14 @@ export function zeroDevWalletTransport(
     name = 'ZeroDev Wallet Transport',
   } = options
 
-  return ({ stamper }) => {
+  return ({ indexedDbStamper, webauthnStamper }) => {
     // Create REST transport with stamper
     const transport = rest(baseUrl, {
       timeoutMs,
       key,
       name,
-      stamper,
+      indexedDbStamper,
+      webauthnStamper,
     })
 
     return {
@@ -45,7 +46,8 @@ export function zeroDevWalletTransport(
       },
       request: transport.request,
       value: {
-        stamper,
+        indexedDbStamper,
+        webauthnStamper,
       },
     }
   }

package/src/client/transports/rest.ts

@@ -1,12 +1,14 @@
 import { RestRequestError, RestTimeoutError } from '../../errors/request.js'
-import type { Stamper } from '../../stampers/types.js'
+import type { IndexedDbStamper, WebauthnStamper } from '../../stampers/types.js'
 
 export type RestRequestArgs = {
   path: string
   method?: 'GET' | 'POST' | 'PUT' | 'DELETE'
   body?: any
   headers?: Record<string, string>
-  stamp?: boolean // When true, will stamp the request body
+  stamp?: boolean
+  stampWith?: 'indexedDb' | 'webAuthn'
+  stampPostion?: 'body' | 'headers'
 }
 
 export type RestRequestFn = <T = any>(args: RestRequestArgs) => Promise<T>
@@ -27,13 +29,11 @@ export type RestTransportConfig = {
   timeoutMs?: number
   key?: string
   name?: string
-  stamper?: Stamper
+  indexedDbStamper: IndexedDbStamper
+  webauthnStamper: WebauthnStamper
 }
 
-export function rest(
-  url: string,
-  cfg: RestTransportConfig = {},
-): RestTransport {
+export function rest(url: string, cfg: RestTransportConfig): RestTransport {
   const timeoutMs = cfg.timeoutMs ?? 10_000
   const key = cfg.key ?? 'rest'
   const name = cfg.name ?? 'HTTP REST'
@@ -45,20 +45,33 @@ export function rest(
 
     try {
       let requestBody = args.body
-      const requestHeaders = {
+      let requestHeaders = {
         'content-type': 'application/json',
         ...(args.headers ?? {}),
         ...(cfg.fetchOptions?.headers ?? {}),
       }
 
       // Handle stamping if requested
-      if (args.stamp && cfg.stamper) {
+      if (args.stamp) {
+        let stamper: IndexedDbStamper | WebauthnStamper
+        if (args.stampWith === 'indexedDb') {
+          stamper = cfg.indexedDbStamper
+        } else if (args.stampWith === 'webAuthn') {
+          stamper = cfg.webauthnStamper
+        } else {
+          stamper = cfg.indexedDbStamper
+        }
         const { body, apiUrl } = args.body
         const bodyString = `${JSON.stringify(body ?? args.body)}\n`
-        const stamp = await cfg.stamper.stamp(bodyString)
+        const stamp = await stamper.stamp(bodyString)
 
         // Restructure request body to match backend expectation
-        if (body) {
+        if (args.stampPostion === 'headers') {
+          requestHeaders = {
+            ...requestHeaders,
+            [stamp.stampHeaderName]: stamp.stampHeaderValue,
+          }
+        } else if (body) {
           requestBody = {
             body: bodyString,
             stamp: {

package/src/client/types.ts

@@ -1,4 +1,4 @@
-import type { Stamper } from '../stampers/types.js'
+import type { IndexedDbStamper, WebauthnStamper } from '../stampers/types.js'
 import type { RestRequestFn } from './transports/rest.js'
 
 export type TransportConfig = {
@@ -16,35 +16,33 @@ export type TransportConfig = {
   type: string
 }
 
-export type Transport = (options: { stamper: Stamper }) => {
+export type Transport = (options: {
+  indexedDbStamper: IndexedDbStamper
+  webauthnStamper: WebauthnStamper
+}) => {
   config: TransportConfig
   request: RestRequestFn
   value?: Record<string, unknown>
 }
 
-export type ClientConfig<TStamper extends Stamper = Stamper> = {
-  /** Transport for the client */
+export type ClientConfig = {
   transport: Transport
-  /** Stamper for authenticated requests */
-  stamper: TStamper
-  /** Organization ID */
+  indexedDbStamper: IndexedDbStamper
+  webauthnStamper: WebauthnStamper
   organizationId?: string
-  /** A key for the client. */
   key?: string
-  /** A name for the client. */
   name?: string
 }
 
-export type Client<
-  extended extends Extended | undefined = undefined,
-  TStamper extends Stamper = Stamper,
-> = {
+export type Client<extended extends Extended | undefined = undefined> = {
   /** Transport configuration */
   transport: TransportConfig & Record<string, unknown>
   /** Request function from transport */
   request: RestRequestFn
-  /** Stamper for authenticated requests */
-  stamper: TStamper
+  /** IndexedDB Stamper for authenticated requests */
+  indexedDbStamper: IndexedDbStamper
+  /** WebAuthn Stamper for authenticated requests */
+  webauthnStamper: WebauthnStamper
   /** Organization ID */
   organizationId?: string
   /** A key for the client */

package/src/core/createZeroDevWallet.ts

@@ -13,7 +13,6 @@ import {
   KMS_SERVER_URL,
 } from '../constants.js'
 import { createIndexedDbStamper } from '../stampers/indexedDbStamper.js'
-import type { IndexedDbStamper } from '../stampers/types.js'
 import { createWebauthnStamper } from '../stampers/webauthnStamper.js'
 import { createWebStorageAdapter } from '../storage/adapters.js'
 import {
@@ -73,7 +72,7 @@ export type AuthParams =
     }
 
 export interface ZeroDevWalletSDK {
-  client: () => ZeroDevWalletClient | null
+  client: ZeroDevWalletClient
   auth: (params: AuthParams) => Promise<any>
 
   getPublicKey: () => Promise<string | null>
@@ -112,42 +111,19 @@ export async function createZeroDevWallet(
 
   const webauthnStamper = await createWebauthnStamper({ rpId })
 
-  let currentClient: ZeroDevWalletClient | null = null
-
-  const indexedDbClient = createClient({
-    stamper: indexedDbStamper,
-    transport: zeroDevWalletTransport({
-      baseUrl: config.proxyBaseUrl || `${KMS_SERVER_URL}/api/v1`,
-    }),
-  })
-
-  const passkeyClient = createClient({
-    stamper: webauthnStamper,
+  const client = createClient({
+    indexedDbStamper,
+    webauthnStamper,
     transport: zeroDevWalletTransport({
       baseUrl: config.proxyBaseUrl || `${KMS_SERVER_URL}/api/v1`,
     }),
   })
 
-  // Restore active session on initialization
-  const activeSession = await sessionStorageManager.getActiveSession()
-
-  if (activeSession) {
-    try {
-      if (activeSession.stamperType === 'indexedDb') {
-        currentClient = indexedDbClient
-      }
-    } catch (_error) {}
-  }
-
-  const getClient = () => {
-    return currentClient
-  }
-
   return {
-    client: getClient,
+    client,
     async getPublicKey() {
-      await indexedDbClient.stamper.resetKeyPair()
-      const compressedPublicKey = await indexedDbClient.stamper.getPublicKey()
+      await client.indexedDbStamper.resetKeyPair()
+      const compressedPublicKey = await client.indexedDbStamper.getPublicKey()
       return compressedPublicKey
     },
 
@@ -168,23 +144,6 @@ export async function createZeroDevWallet(
       await sessionStorageManager.setActiveSession(sessionId)
       const session = await sessionStorageManager.getActiveSession()
 
-      if (session) {
-        // Update current client based on session's stamper type
-        let stamper: IndexedDbStamper | undefined
-        if (session.stamperType === 'indexedDb') {
-          stamper = indexedDbStamper
-        }
-
-        if (stamper) {
-          currentClient = createClient({
-            stamper,
-            transport: zeroDevWalletTransport({
-              baseUrl: config.proxyBaseUrl || `${KMS_SERVER_URL}/api/v1`,
-            }),
-          })
-        }
-      }
-
       return session
     },
 
@@ -194,7 +153,6 @@ export async function createZeroDevWallet(
 
     async clearAllSessions() {
       await sessionStorageManager.clearAllSessions()
-      currentClient = null
     },
 
     async refreshSession(sessionId?: string) {
@@ -215,12 +173,13 @@ export async function createZeroDevWallet(
         )
         const compressedPublicKeyHex =
           await generateCompressedPublicKeyFromKeyPair(newKeyPair)
-        const data = await indexedDbClient.loginWithStamp({
+        const data = await client.loginWithStamp({
           targetPublicKey: compressedPublicKeyHex,
           projectId,
           organizationId: activeSession.organizationId,
+          stampWith: 'indexedDb',
         })
-        await indexedDbClient.stamper.resetKeyPair(newKeyPair)
+        await client.indexedDbStamper.resetKeyPair(newKeyPair)
         const parsedSession = parseSession(data.session)
         const session: ZeroDevWalletSession = {
           id: `session_indexedDb_${Date.now()}`,
@@ -234,7 +193,6 @@ export async function createZeroDevWallet(
         }
         await sessionStorageManager.clearSession(activeSession.id)
         await sessionStorageManager.storeSession(session, session.id)
-        currentClient = indexedDbClient
         return session
       }
       throw new Error('Invalid session type')
@@ -245,13 +203,13 @@ export async function createZeroDevWallet(
       switch (params.type) {
         case 'oauth': {
           const { credential } = params
-          const targetPublicKey = await indexedDbClient.stamper.getPublicKey()
+          const targetPublicKey = await client.indexedDbStamper.getPublicKey()
 
           if (!targetPublicKey) {
             throw new Error('Failed to get public key')
           }
 
-          const data = await indexedDbClient.authenticateWithOAuth({
+          const data = await client.authenticateWithOAuth({
             oidcToken: credential,
             provider: 'google',
             targetPublicKey,
@@ -274,7 +232,6 @@ export async function createZeroDevWallet(
             }
             await sessionStorageManager.storeSession(session, session.id)
           }
-          currentClient = indexedDbClient
           return data
         }
         case 'passkey': {
@@ -285,8 +242,8 @@ export async function createZeroDevWallet(
             params.mode === 'register'
           ) {
             const { email } = params
-            await indexedDbClient.stamper.resetKeyPair()
-            const tempPublicKey = await indexedDbClient.stamper.getPublicKey()
+            await client.indexedDbStamper.resetKeyPair()
+            const tempPublicKey = await client.indexedDbStamper.getPublicKey()
             if (!tempPublicKey) {
               throw new Error('Failed to get public key')
             }
@@ -315,7 +272,7 @@ export async function createZeroDevWallet(
                 },
               },
             })
-            const data = await passkeyClient.registerWithPasskey({
+            const data = await client.registerWithPasskey({
               email,
               attestation,
               challenge: encodedChallenge,
@@ -332,12 +289,12 @@ export async function createZeroDevWallet(
             )
             const compressedPublicKeyHex =
               await generateCompressedPublicKeyFromKeyPair(newKeyPair)
-            const loginData = await indexedDbClient.loginWithStamp({
+            const loginData = await client.loginWithStamp({
               projectId,
               targetPublicKey: compressedPublicKeyHex,
               organizationId: data.subOrganizationId,
             })
-            await indexedDbClient.stamper.resetKeyPair(newKeyPair)
+            await client.indexedDbStamper.resetKeyPair(newKeyPair)
             const parsedSession = parseSession(loginData.session)
             const session: ZeroDevWalletSession = {
               id: `session_indexedDb_${Date.now()}`,
@@ -352,7 +309,6 @@ export async function createZeroDevWallet(
               token: loginData.session,
             }
             await sessionStorageManager.storeSession(session, session.id)
-            currentClient = indexedDbClient
             return data
           }
           if (
@@ -360,16 +316,17 @@ export async function createZeroDevWallet(
             'mode' in params &&
             params.mode === 'login'
           ) {
-            await indexedDbClient.stamper.resetKeyPair()
+            await client.indexedDbStamper.resetKeyPair()
             const generatedPublicKey =
-              await indexedDbClient.stamper.getPublicKey()
+              await client.indexedDbStamper.getPublicKey()
             if (!generatedPublicKey) {
               throw new Error('Failed to get public key')
             }
-            const loginData = await passkeyClient.loginWithStamp({
+            const loginData = await client.loginWithStamp({
               targetPublicKey: generatedPublicKey,
               projectId,
               organizationId,
+              stampWith: 'webauthn',
             })
             const parsedSession = parseSession(loginData.session)
             const session: ZeroDevWalletSession = {
@@ -385,7 +342,6 @@ export async function createZeroDevWallet(
               token: loginData.session,
             }
             await sessionStorageManager.storeSession(session, session.id)
-            currentClient = indexedDbClient
             return loginData
           }
           throw new Error('Passkey authentication requires passkey parameter')
@@ -396,7 +352,7 @@ export async function createZeroDevWallet(
           if (type === 'otp' && mode === 'sendOtp') {
             const { email, contact, emailCustomization } = params
 
-            const data = await indexedDbClient.registerWithOTP({
+            const data = await client.registerWithOTP({
               email,
               contact,
               projectId,
@@ -408,14 +364,14 @@ export async function createZeroDevWallet(
 
           if (type === 'otp' && mode === 'verifyOtp') {
             const { otpId, otpCode, subOrganizationId } = params
-            await indexedDbClient.stamper.resetKeyPair()
-            const targetPublicKey = await indexedDbClient.stamper.getPublicKey()
+            await client.indexedDbStamper.resetKeyPair()
+            const targetPublicKey = await client.indexedDbStamper.getPublicKey()
 
             if (!targetPublicKey) {
               throw new Error('Failed to get public key')
             }
 
-            const data = await indexedDbClient.loginWithOTP({
+            const data = await client.loginWithOTP({
               otpId,
               otpCode,
               subOrganizationId,
@@ -440,7 +396,6 @@ export async function createZeroDevWallet(
               }
               await sessionStorageManager.storeSession(session, session.id)
             }
-            currentClient = indexedDbClient
             return data
           }
 
@@ -453,8 +408,7 @@ export async function createZeroDevWallet(
 
     async logout() {
       await sessionStorageManager.clearAllSessions()
-      currentClient = null
-      await indexedDbClient.stamper.resetKeyPair()
+      await client.indexedDbStamper.resetKeyPair()
       return true
     },
 
@@ -463,14 +417,12 @@ export async function createZeroDevWallet(
       if (!session) {
         throw new Error('No active session')
       }
-      if (!currentClient) {
-        throw new Error('No client')
-      }
 
       return toViemAccount({
-        client: currentClient,
+        client,
         organizationId: session.organizationId,
         projectId,
+        token: session.token ?? '',
       })
     },
   }

package/src/utils/exportWallet.ts

@@ -54,9 +54,12 @@ export async function exportWallet(
       organizationId,
     })
 
-    const listWalletsStamp = await wallet
-      .client()
-      ?.stamper.stamp(listWalletsBody)
+    const listWalletsStamp =
+      await wallet.client[
+        session.stamperType === 'indexedDb'
+          ? 'indexedDbStamper'
+          : 'webauthnStamper'
+      ].stamp(listWalletsBody)
     if (!listWalletsStamp) {
       throw new Error('Failed to stamp list wallets body')
     }
@@ -88,9 +91,12 @@ export async function exportWallet(
         language: 'MNEMONIC_LANGUAGE_ENGLISH',
       },
     })
-    const exportWalletStamp = await wallet
-      .client()
-      ?.stamper.stamp(exportWalletBody)
+    const exportWalletStamp =
+      await wallet.client[
+        session.stamperType === 'indexedDb'
+          ? 'indexedDbStamper'
+          : 'webauthnStamper'
+      ].stamp(exportWalletBody)
     if (!exportWalletStamp) {
       throw new Error('Failed to stamp export wallet body')
     }