Merge pull request #14 from beefyfinance/fixes

Fix graphql mesh same data returned
beefyfinance · Jun 11, 2024 · 7c352ca · 7c352ca
2 parents 53ed710 + 3f5a82e
commit 7c352ca
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/routes/v1/vault.ts b/src/routes/v1/vault.ts
@@ -182,7 +182,7 @@ const getVaultPrice = async (chain: ChainId, vault_address: string) => {
       throw new GraphQueryError(e);
     });
 
-  const vault = res.clm || res.beta_clm;
+  const vault = res.clm || (chain === 'arbitrum' ? res.beta_clm : undefined);
   if (!vault) {
     return undefined;
   }
@@ -204,7 +204,7 @@ const getVaultHarvests = async (chain: ChainId, vault_address: string) => {
       throw new GraphQueryError(e);
     });
 
-  const vault = res.clm || res.beta_clm;
+  const vault = res.clm || (chain === 'arbitrum' ? res.beta_clm : undefined);
   if (!vault) {
     return undefined;
   }
@@ -268,7 +268,7 @@ const getVaultHistoricPrices = async (
       throw new GraphQueryError(e);
     });
 
-  const vault = res.clm || res.beta_clm;
+  const vault = res.clm || (chain === 'arbitrum' ? res.beta_clm : undefined);
   if (!vault) {
     return undefined;
   }
@@ -302,7 +302,7 @@ const getVaultHistoricPricesRange = async (
       throw new GraphQueryError(e);
     });
 
-  const vault = res.clm || res.beta_clm;
+  const vault = res.clm || (chain === 'arbitrum' ? res.beta_clm : undefined);
   if (!vault) {
     return undefined;
   }

diff --git a/src/routes/v1/vaults.ts b/src/routes/v1/vaults.ts
@@ -106,7 +106,7 @@ const getVaults = async (chain: ChainId, period: Period) => {
   const since = BigInt(Math.floor(now.getTime() / 1000) - periodSeconds);
   const rawVaults = await getSdkForChain(chain)
     .Vaults({ since: since.toString() })
-    .then(res => [...res.clms, ...res.beta_clms])
+    .then(res => [...res.clms, ...(chain === 'arbitrum' ? res.beta_clms : [])])
     .catch((e: unknown) => {
       throw new GraphQueryError(e);
     });
@@ -167,7 +167,7 @@ const getVaultsHarvests = async (
     : sdk.VaultsHarvests({ since: since.toString() });
 
   const rawVaults = await queryPromise
-    .then(res => [...res.clms, ...res.beta_clms])
+    .then(res => [...res.clms, ...(chain === 'arbitrum' ? res.beta_clms : [])])
     .catch((e: unknown) => {
       throw new GraphQueryError(e);
     });