feat(react): expose stamper, storage and shouldInit params

packages/react/src/connector.ts

@@ -5,12 +5,16 @@ import {
   createZeroDevPaymasterClient,
 } from '@zerodev/sdk'
 import { getEntryPoint, KERNEL_V3_3 } from '@zerodev/sdk/constants'
-import type { StorageAdapter } from '@zerodev/wallet-core'
+import type {
+  ApiKeyStamper,
+  PasskeyStamper,
+  StorageAdapter,
+} from '@zerodev/wallet-core'
 import { createZeroDevWallet, KMS_SERVER_URL } from '@zerodev/wallet-core'
 import { type Chain, createPublicClient, http } from 'viem'
 import { handleOAuthCallback, type OAuthProvider } from './oauth.js'
 import { createProvider } from './provider.js'
-import { createZeroDevWalletStore } from './store.js'
+import { type CreateStoreOptions, createZeroDevWalletStore } from './store.js'
 import { getAAUrl } from './utils/aaUtils.js'
 
 // OAuth URL parameter used to detect callback
@@ -27,7 +31,7 @@ async function detectAndHandleOAuthCallback(
   wallet: Awaited<ReturnType<typeof createZeroDevWallet>>,
   store: ReturnType<typeof createZeroDevWalletStore>,
 ): Promise<boolean> {
-  if (typeof window === 'undefined') return false
+  if (typeof window === 'undefined' || !window.location?.search) return false
 
   const params = new URLSearchParams(window.location.search)
   const isOAuthCallback = params.get(OAUTH_SUCCESS_PARAM) === 'true'
@@ -82,8 +86,14 @@ export type ZeroDevWalletConnectorParams = {
   chains: readonly Chain[]
   rpId?: string
   sessionStorage?: StorageAdapter
+  persistStorage?: CreateStoreOptions['storage']
+  apiKeyStamper?: Promise<ApiKeyStamper>
+  passkeyStamper?: Promise<PasskeyStamper>
   autoRefreshSession?: boolean
   sessionWarningThreshold?: number
+  // Controls whether the connector should initialize
+  // On Web: pass `typeof window !== 'undefined'` to only initialize on client side
+  shouldInitialize?: boolean | (() => boolean)
 }
 
 export function zeroDevWallet(
@@ -125,6 +135,15 @@ export function zeroDevWallet(
     const doInitialize = async () => {
       console.log('Initializing ZeroDevWallet connector...')
 
+      let apiKeyStamper: ApiKeyStamper | undefined
+      let passkeyStamper: PasskeyStamper | undefined
+      if (params.apiKeyStamper) {
+        apiKeyStamper = await params.apiKeyStamper
+      }
+      if (params.passkeyStamper) {
+        passkeyStamper = await params.passkeyStamper
+      }
+
       // Initialize wallet SDK
       const wallet = await createZeroDevWallet({
         projectId: params.projectId,
@@ -136,9 +155,15 @@ export function zeroDevWallet(
           sessionStorage: params.sessionStorage,
         }),
         ...(params.rpId && { rpId: params.rpId }),
+        ...(apiKeyStamper && { apiKeyStamper }),
+        ...(passkeyStamper && { passkeyStamper }),
       })
 
       // Create store
+      store = createZeroDevWalletStore({
+        ...(params.persistStorage && { storage: params.persistStorage }),
+      })
+
       store = createZeroDevWalletStore()
       store.getState().setWallet(wallet)
 
@@ -176,8 +201,11 @@ export function zeroDevWallet(
       type: 'injected' as const,
 
       async setup() {
-        // Initialize on client-side mount (setup only runs client-side)
-        if (typeof window !== 'undefined') {
+        const shouldInit =
+          typeof params.shouldInitialize === 'function'
+            ? params.shouldInitialize()
+            : (params.shouldInitialize ?? typeof window !== 'undefined')
+        if (shouldInit) {
           await initialize()
         }
       },

packages/react/src/store.ts

@@ -9,7 +9,12 @@ import type {
 import type { LocalAccount } from 'viem'
 import type { SmartAccount } from 'viem/account-abstraction'
 import { create } from 'zustand'
-import { persist, subscribeWithSelector } from 'zustand/middleware'
+import {
+  createJSONStorage,
+  persist,
+  type StateStorage,
+  subscribeWithSelector,
+} from 'zustand/middleware'
 
 // Internal OAuth config stored in the state (derived from connector params)
 type InternalOAuthConfig = {
@@ -49,7 +54,11 @@ export type ZeroDevWalletState = {
   clear: () => void
 }
 
-export const createZeroDevWalletStore = () =>
+export type CreateStoreOptions = {
+  storage?: StateStorage<void>
+}
+
+export const createZeroDevWalletStore = (options?: CreateStoreOptions) =>
   create<ZeroDevWalletState>()(
     subscribeWithSelector(
       persist(
@@ -106,6 +115,9 @@ export const createZeroDevWalletStore = () =>
             session: state.session,
             activeChainId: state.activeChainId,
           }),
+          ...(options?.storage && {
+            storage: createJSONStorage(() => options.storage!),
+          }),
         },
       ),
     ),