fix: comdex (#563)

White-Whale-Defi-Platform · May 2, 2024 · fa9533f · fa9533f
1 parent c92f3f5
commit fa9533f
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 14 deletions.
diff --git a/components/Pages/Bonding/hooks/getBondingConfig.ts b/components/Pages/Bonding/hooks/getBondingConfig.ts
@@ -19,7 +19,7 @@ export interface BondingContractConfig {
 
 export const getBondingConfig = async (client: CosmWasmClient | null,
   config: Config) => {
-  if (!client && !config) {
+  if (!client || !config?.whale_lair) {
     return null
   }
   const bondingConfig = await fetchConfig(client, config)
@@ -29,7 +29,10 @@ export const getBondingConfig = async (client: CosmWasmClient | null,
 export const fetchConfig = async (client: CosmWasmClient,
   config: Config): Promise<BondingContractConfig> => {
   // TODO: API
-  const result: JsonObject = await client.queryContractSmart(config.whale_lair,
+  if (!client || !config?.whale_lair) {
+    return null
+  }
+  const result: JsonObject = await client.queryContractSmart(config?.whale_lair,
     {
       config: {},
     })

diff --git a/components/Pages/Bonding/hooks/getCurrentEpoch.ts b/components/Pages/Bonding/hooks/getCurrentEpoch.ts
@@ -37,7 +37,10 @@ export interface Epoch {
 
 export const fetchCurrentEpoch = async (client: CosmWasmClient,
   config: Config): Promise<Epoch> => {
-  const result: JsonObject = await client?.queryContractSmart(config.fee_distributor,
+    if (!client || !config?.fee_distributor) {
+      return null
+    }
+  const result: JsonObject = await client?.queryContractSmart(config?.fee_distributor,
     {
       current_epoch: {},
     })
@@ -47,10 +50,10 @@ export const fetchCurrentEpoch = async (client: CosmWasmClient,
 
 export const getCurrentEpoch = async (client: CosmWasmClient,
   config: Config) => {
-  if (!client) {
+  if (!client || !config?.fee_distributor) {
     return null
   }
-
+  console.log(config, client)
   const currentEpoch = await fetchCurrentEpoch(client, config)
 
   return { currentEpoch }

diff --git a/components/Pages/Bonding/hooks/getFeeDistributorConfig.ts b/components/Pages/Bonding/hooks/getFeeDistributorConfig.ts
@@ -22,7 +22,7 @@ const fetchConfig = async (client: CosmWasmClient,
   config: Config): Promise<FeeDistributionConfig> => {
   // TODO: API
 
-  const result: JsonObject = await client.queryContractSmart(config.fee_distributor,
+  const result: JsonObject = await client.queryContractSmart(config?.fee_distributor,
     {
       config: {},
     })
@@ -31,7 +31,7 @@ const fetchConfig = async (client: CosmWasmClient,
 }
 export const getFeeDistributorConfig = async (client: CosmWasmClient,
   config: Config) => {
-  if (!client) {
+  if (!client || !config?.fee_distributor) {
     return null
   }
   const feeDistributionConfig = await fetchConfig(client, config)

diff --git a/components/Pages/Trade/Incentivize/hooks/useEpoch.ts b/components/Pages/Trade/Incentivize/hooks/useEpoch.ts
@@ -86,20 +86,23 @@ const useEpoch = () => {
   const { cosmWasmClient } = useClients(walletChainName)
   const { data: config } = useQuery<EpochConfigData>({
     queryKey: ['incentive', 'config', contracts?.fee_distributor],
-    queryFn: async () =>
-      // TODO: API
-      await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
+    queryFn: async () => {
+      if (!contracts?.fee_distributor) {
+        return null
+      }
+      return await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
         config: {},
-      }),
-    enabled: Boolean(contracts) && Boolean(cosmWasmClient),
+      })
+    },
+    enabled: Boolean(contracts?.fee_distributor) && Boolean(cosmWasmClient),
   })
 
   const { data } = useQuery<EpochData>({
     queryKey: ['incentive', 'epoch', contracts?.fee_distributor],
     queryFn: async () => await cosmWasmClient?.queryContractSmart(contracts?.fee_distributor, {
       current_epoch: {},
     }),
-    enabled: Boolean(contracts) && Boolean(cosmWasmClient),
+    enabled: Boolean(contracts?.fee_distributor) && Boolean(cosmWasmClient),
   })
   const dateToEpoch = (givenDate) => {
     if (!data?.epoch?.id || !config?.epoch_config?.duration || !givenDate) {

diff --git a/constants/endpoints.json b/constants/endpoints.json
@@ -36,7 +36,7 @@
             "https://rpc.comdex.one"
         ],
         "rest": [
-            "https://ww-comdex-rest.polkachu.com"
+            "https://rest.comdex.one"
         ]
     },
     "injective": {

diff --git a/public/mainnet/comdex-1/config.json b/public/mainnet/comdex-1/config.json
@@ -0,0 +1,3 @@
+{
+}
+