fix: use only unique providers

lifinance · Jan 15, 2024 · 5bff9f3 · 5bff9f3
1 parent 45ff26d
commit 5bff9f3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -8,6 +8,7 @@ export const config = (() => {
     apiUrl: 'https://li.quest/v1',
     rpcUrls: {},
     chains: [],
+    providers: [],
     preloadChains: true,
   }
   let _loading: Promise<void> | undefined
@@ -19,14 +20,22 @@ export const config = (() => {
       return _config
     },
     set(options: SDKConfig) {
-      Object.assign(_config, options)
-      if (options.chains) {
-        this.setChains(options.chains)
+      const { chains, providers, ...otherOptions } = options
+      Object.assign(_config, otherOptions)
+      if (chains) {
+        this.setChains(chains)
+      }
+      if (providers) {
+        this.setProviders(providers)
       }
       return _config
     },
     setProviders(providers: SDKProvider[]) {
-      _config.providers = providers
+      const providerMap = new Map(
+        _config.providers.map((provider) => [provider.type, provider])
+      )
+      providers.forEach((provider) => providerMap.set(provider.type, provider))
+      _config.providers = Array.from(providerMap.values())
     },
     setChains(chains: ExtendedChain[]) {
       hydrateRPCUrls(this.get(), chains)

diff --git a/src/core/execution.ts b/src/core/execution.ts
@@ -108,7 +108,7 @@ const executeSteps = async (
 
       const provider = config
         .get()
-        .providers?.find((provider) => provider.isAddress(fromAddress))
+        .providers.find((provider) => provider.isAddress(fromAddress))
 
       if (!provider) {
         throw new Error('SDK Execution Provider not found.')

diff --git a/src/core/provider.ts b/src/core/provider.ts
@@ -4,7 +4,7 @@ import { config } from '../config.js'
 export const getProvider = <T>(type: ChainType): T => {
   const provider = config
     .get()
-    .providers?.find((provider) => provider.type === type) as T
+    .providers.find((provider) => provider.type === type) as T
   if (!provider) {
     throw new Error(`${type} provider not found.`)
   }

diff --git a/src/services/balance.ts b/src/services/balance.ts
@@ -78,7 +78,7 @@ export const getTokenBalancesByChain = async (
       const baseTokenAddress = tokensByChain[chainId][0].address
       const provider = config
         .get()
-        .providers?.find((provider) => provider.isAddress(baseTokenAddress))
+        .providers.find((provider) => provider.isAddress(baseTokenAddress))
       if (!provider) {
         throw new Error('SDK Token Provider not found.')
       }

diff --git a/src/types/internal.ts b/src/types/internal.ts
@@ -6,7 +6,7 @@ export interface SDKBaseConfig {
   apiUrl: string
   integrator: string
   userId?: string
-  providers?: SDKProvider[]
+  providers: SDKProvider[]
   routeOptions?: RouteOptions
   rpcUrls: Partial<Record<ChainId, string[]>>
   chains: ExtendedChain[]