feat: move the algod client to store (#224)

* #213 move the algod client to store * PersistedState type
TxnLab · Sep 3, 2024 · 07e7273 · 07e7273
1 parent 173f787
commit 07e7273
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 24 deletions.
diff --git a/packages/use-wallet-solid/src/index.tsx b/packages/use-wallet-solid/src/index.tsx
@@ -94,8 +94,6 @@ export function useWallet() {
     const { token, baseServer, port, headers } = manager().networkConfig[networkId]
     const newClient = new algosdk.Algodv2(token, baseServer, port, headers)
 
-    manager().algodClient = newClient
-
     manager().store.setState((state) => ({
       ...state,
       activeNetwork: networkId,

diff --git a/packages/use-wallet-vue/src/__tests__/useWallet.test.ts b/packages/use-wallet-vue/src/__tests__/useWallet.test.ts
@@ -301,7 +301,8 @@ describe('useWallet', () => {
       mockSetAlgodClient(newAlgodClient)
       mockWalletManager.store.setState((state) => ({
         ...state,
-        activeNetwork: networkId
+        activeNetwork: networkId,
+        algodClient: newAlgodClient
       }))
     }
 

diff --git a/packages/use-wallet/src/__tests__/manager.test.ts b/packages/use-wallet/src/__tests__/manager.test.ts
@@ -303,11 +303,10 @@ describe('WalletManager', () => {
 
   describe('savePersistedState', () => {
     it('saves state to local storage', async () => {
-      const stateToSave: State = {
+      const stateToSave: Omit<State, 'algodClient'> = {
         wallets: {},
         activeWallet: null,
-        activeNetwork: NetworkId.MAINNET,
-        algodClient: new Algodv2('', 'https://testnet-api.algonode.cloud/')
+        activeNetwork: NetworkId.MAINNET
       }
 
       const manager = new WalletManager({

diff --git a/packages/use-wallet/src/__tests__/store.test.ts b/packages/use-wallet/src/__tests__/store.test.ts
@@ -426,7 +426,8 @@ describe('Mutations', () => {
       expect(store.state.activeNetwork).toBe(NetworkId.TESTNET)
 
       const networkId = NetworkId.MAINNET
-      setActiveNetwork(store, { networkId })
+      const algodClient = new Algodv2('', 'https://mainnet-api.algonode.cloud/')
+      setActiveNetwork(store, { networkId, algodClient })
       expect(store.state.activeNetwork).toBe(networkId)
     })
   })

diff --git a/packages/use-wallet/src/manager.ts b/packages/use-wallet/src/manager.ts
@@ -36,20 +36,30 @@ export interface WalletManagerConfig {
   algod?: NetworkConfig
 }
 
+export type PersistedState = Omit<State, 'algodClient'>
+
 export class WalletManager {
   public _clients: Map<WalletId, BaseWallet> = new Map()
 
   public networkConfig: NetworkConfigMap
-  public algodClient: algosdk.Algodv2
 
   public store: Store<State>
   public subscribe: (callback: (state: State) => void) => () => void
 
   constructor({ wallets = [], network = NetworkId.TESTNET, algod = {} }: WalletManagerConfig = {}) {
-    const initialState = this.loadPersistedState() || {
-      ...defaultState,
-      activeNetwork: network
-    }
+    this.networkConfig = this.initNetworkConfig(network, algod)
+
+    const persistedState = this.loadPersistedState()
+    const initialState: State = persistedState
+      ? {
+          ...persistedState,
+          algodClient: this.createAlgodClient(this.networkConfig[persistedState.activeNetwork])
+        }
+      : {
+          ...defaultState,
+          activeNetwork: network,
+          algodClient: this.createAlgodClient(this.networkConfig[network])
+        }
 
     this.store = new Store<State>(initialState, {
       onUpdate: () => this.savePersistedState()
@@ -65,15 +75,23 @@ export class WalletManager {
       return unsubscribe
     }
 
-    this.networkConfig = this.initNetworkConfig(network, algod)
-    this.algodClient = this.createAlgodClient(this.networkConfig[initialState.activeNetwork])
-
     this.initializeWallets(wallets)
   }
 
   // ---------- Store ------------------------------------------------- //
 
-  private loadPersistedState(): State | null {
+  public get algodClient(): algosdk.Algodv2 {
+    return this.store.state.algodClient
+  }
+
+  public set algodClient(algodClient: algosdk.Algodv2) {
+    this.store.setState((state) => ({
+      ...state,
+      algodClient
+    }))
+  }
+
+  private loadPersistedState(): PersistedState | null {
     try {
       const serializedState = StorageAdapter.getItem(LOCAL_STORAGE_KEY)
       if (serializedState === null) {
@@ -84,7 +102,7 @@ export class WalletManager {
         console.warn('[Store] Parsed state:', parsedState)
         throw new Error('Persisted state is invalid')
       }
-      return parsedState as State
+      return parsedState as PersistedState
     } catch (error: any) {
       console.error(`[Store] Could not load state from local storage: ${error.message}`)
       return null
@@ -93,8 +111,9 @@ export class WalletManager {
 
   private savePersistedState(): void {
     try {
-      const state = this.store.state
-      const serializedState = JSON.stringify(state)
+      const { wallets, activeWallet, activeNetwork } = this.store.state
+      const persistedState: PersistedState = { wallets, activeWallet, activeNetwork }
+      const serializedState = JSON.stringify(persistedState)
       StorageAdapter.setItem(LOCAL_STORAGE_KEY, serializedState)
     } catch (error) {
       console.error('[Store] Could not save state to local storage:', error)
@@ -205,7 +224,7 @@ export class WalletManager {
   }
 
   private createAlgodClient(config: AlgodConfig): algosdk.Algodv2 {
-    console.info(`[Manager] Creating Algodv2 client for ${this.activeNetwork}...`)
+    if (this.store) console.info(`[Manager] Creating Algodv2 client for ${this.activeNetwork}...`)
     const { token = '', baseServer, port = '', headers = {} } = config
     return new algosdk.Algodv2(token, baseServer, port, headers)
   }
@@ -219,8 +238,8 @@ export class WalletManager {
       return
     }
 
-    setActiveNetwork(this.store, { networkId })
-    this.algodClient = this.createAlgodClient(this.networkConfig[networkId])
+    const algodClient = this.createAlgodClient(this.networkConfig[networkId])
+    setActiveNetwork(this.store, { networkId, algodClient })
 
     console.info(`[Manager] ✅ Active network set to ${networkId}.`)
   }

diff --git a/packages/use-wallet/src/store.ts b/packages/use-wallet/src/store.ts
@@ -143,10 +143,14 @@ export function setAccounts(
   })
 }
 
-export function setActiveNetwork(store: Store<State>, { networkId }: { networkId: NetworkId }) {
+export function setActiveNetwork(
+  store: Store<State>,
+  { networkId, algodClient }: { networkId: NetworkId; algodClient: Algodv2 }
+) {
   store.setState((state) => ({
     ...state,
-    activeNetwork: networkId
+    activeNetwork: networkId,
+    algodClient
   }))
 }