@zerodev/wallet-react 0.0.1-alpha.4 → 0.0.1-alpha.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zerodev/wallet-react",
-  "version": "0.0.1-alpha.4",
+  "version": "0.0.1-alpha.5",
   "description": "React hooks for ZeroDev Wallet SDK",
   "sideEffects": false,
   "main": "./dist/_cjs/index.js",

package/src/connector.ts

@@ -75,10 +75,6 @@ export function zeroDevWallet(
       store = createZeroDevWalletStore()
       store.getState().setWallet(wallet)
 
-      // Initialize chainIds
-      const chainIds = params.chains.map((c) => c.id)
-      store.setState({ chainIds })
-
       // Store OAuth config if provided
       if (params.oauthConfig) {
         store.getState().setOAuthConfig(params.oauthConfig)
@@ -132,10 +128,8 @@ export function zeroDevWallet(
         const state = store.getState()
 
         // Determine active chain
-        const activeChainId = chainId || state.chainIds[0]
-        if (!activeChainId) {
-          throw new Error('No chain configured')
-        }
+        const activeChainId =
+          chainId ?? state.activeChainId ?? params.chains[0].id
 
         // If reconnecting and already have kernel account, return immediately
         if (isReconnecting && state.kernelAccounts.has(activeChainId)) {
@@ -198,7 +192,7 @@ export function zeroDevWallet(
         }
 
         // Set as active chain
-        store.getState().setActiveChain(activeChainId)
+        store.getState().setActiveChainId(activeChainId)
 
         // Get fresh state after updates
         const freshState = store.getState()
@@ -229,7 +223,7 @@ export function zeroDevWallet(
 
       async getAccounts() {
         if (!store) return []
-        const { eoaAccount, kernelAccounts, chainIds } = store.getState()
+        const { eoaAccount, kernelAccounts, activeChainId } = store.getState()
 
         // Return EOA address if we have it (EIP-7702: EOA address = kernel address)
         if (eoaAccount) {
@@ -237,15 +231,15 @@ export function zeroDevWallet(
         }
 
         // Fallback: check kernel accounts
-        const activeAccount = chainIds[0]
-          ? kernelAccounts.get(chainIds[0])
+        const activeAccount = activeChainId
+          ? kernelAccounts.get(activeChainId)
           : null
         return activeAccount ? [activeAccount.address] : []
       },
 
       async getChainId() {
         if (!store) return params.chains[0].id
-        return store.getState().chainIds[0] || params.chains[0].id
+        return store.getState().activeChainId ?? params.chains[0].id
       },
 
       async getProvider() {
@@ -264,7 +258,7 @@ export function zeroDevWallet(
         }
 
         // Update active chain
-        store.getState().setActiveChain(chainId)
+        store.getState().setActiveChainId(chainId)
 
         // Create kernel account for new chain if doesn't exist
         if (!state.kernelAccounts.has(chainId)) {

package/src/provider.ts

@@ -115,7 +115,10 @@ export function createProvider({
 
     async request({ method, params }: { method: string; params?: any[] }) {
       const state = store.getState()
-      const activeChainId = state.chainIds[0]
+      const activeChainId = state.activeChainId
+      if (!activeChainId) {
+        throw new Error('No active chain')
+      }
 
       switch (method) {
         case 'eth_accounts': {
@@ -219,7 +222,7 @@ export function createProvider({
           const chainId_number = parseInt(chainId, 16)
 
           // Update active chain
-          store.getState().setActiveChain(chainId_number)
+          store.getState().setActiveChainId(chainId_number)
 
           // Emit chainChanged event
           emitter.emit('chainChanged', chainId)

package/src/store.ts

@@ -19,7 +19,7 @@ export type ZeroDevWalletState = {
   session: ZeroDevWalletSession | null
 
   // Multi-chain support
-  chainIds: number[] // [activeChain, ...otherChains]
+  activeChainId: number | null
   kernelAccounts: Map<number, SmartAccount<KernelSmartAccountImplementation>>
   kernelClients: Map<number, KernelAccountClient>
 
@@ -38,7 +38,7 @@ export type ZeroDevWalletState = {
   ) => void
   setKernelClient: (chainId: number, client: KernelAccountClient) => void
   setSession: (session: ZeroDevWalletSession | null) => void
-  setActiveChain: (chainId: number) => void
+  setActiveChainId: (chainId: number | null) => void
   setIsExpiring: (isExpiring: boolean) => void
   setOAuthConfig: (config: OAuthConfig | null) => void
   clear: () => void
@@ -53,7 +53,7 @@ export const createZeroDevWalletStore = () =>
           wallet: null,
           eoaAccount: null,
           session: null,
-          chainIds: [],
+          activeChainId: null,
           kernelAccounts: new Map(),
           kernelClients: new Map(),
           isExpiring: false,
@@ -78,13 +78,7 @@ export const createZeroDevWalletStore = () =>
 
           setSession: (session) => set({ session }),
 
-          setActiveChain: (chainId) => {
-            const { chainIds } = get()
-            // Move chainId to front, remove duplicates
-            set({
-              chainIds: [chainId, ...chainIds.filter((id) => id !== chainId)],
-            })
-          },
+          setActiveChainId: (chainId) => set({ activeChainId: chainId }),
 
           setIsExpiring: (isExpiring) => set({ isExpiring }),
 
@@ -97,7 +91,7 @@ export const createZeroDevWalletStore = () =>
               kernelAccounts: new Map(),
               kernelClients: new Map(),
               isExpiring: false,
-              chainIds: [],
+              activeChainId: null,
             }),
         }),
         {
@@ -105,7 +99,7 @@ export const createZeroDevWalletStore = () =>
           // Only persist session data, not clients or accounts
           partialize: (state) => ({
             session: state.session,
-            chainIds: state.chainIds,
+            activeChainId: state.activeChainId,
           }),
         },
       ),