fix(frontend): provider stats api call

Fujicracy · Aug 29, 2023 · cebf7d2 · cebf7d2
1 parent d77ffd7
commit cebf7d2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/packages/frontend/pages/api/getProviderStats.ts b/packages/frontend/pages/api/getProviderStats.ts
@@ -1,4 +1,3 @@
-import { ethers } from 'ethers';
 import type { NextApiRequest, NextApiResponse } from 'next';
 
 import { getProviderStatsFromAPI } from './helpers/api/defillama';
@@ -12,20 +11,20 @@ export default async function handler(
   try {
     const poolId = req.query.poolId;
     if (!poolId) throw 'No poolId provided';
-    if (!(typeof poolId === 'string' && ethers.utils.isAddress(poolId))) {
+    if (typeof poolId !== 'string') {
       throw 'Invalid poolId provided';
     }
 
     const currentTime = Date.now();
     const dbData = await getProviderStatsFromDB(poolId);
     if (dbData && dbData.timestamp > currentTime - REFRESH_INTERVAL) {
       console.log('Returning cached pool stats');
-      return res.status(Status.SUCCESS).json({ stats: dbData.data });
+      return res.status(Status.SUCCESS).json(dbData.data);
     }
     const stats = await getProviderStatsFromAPI(poolId);
     saveProviderStatsToDB(poolId, stats);
 
-    res.status(Status.SUCCESS).json({ stats });
+    res.status(Status.SUCCESS).json(stats);
   } catch (error) {
     res.status(Status.ERROR).json({ error });
   }

diff --git a/packages/frontend/pages/api/helpers/api/defillama.ts b/packages/frontend/pages/api/helpers/api/defillama.ts
@@ -38,8 +38,8 @@ export async function getFinancialsFromAPI(): Promise<FinancialsResponse> {
 export async function getProviderStatsFromAPI(
   poolId: string
 ): Promise<ProviderStatsResponse> {
-  const chart = axios
+  const stats = await axios
     .get<GetLlamaPoolStatsResponse>(DefillamaUrl.PROVIDER_STATS + `/${poolId}`)
     .then(({ data }) => data.data);
-  return chart;
+  return { stats };
 }
diff --git a/packages/frontend/pages/api/helpers/db.ts b/packages/frontend/pages/api/helpers/db.ts
@@ -3,7 +3,7 @@ import {
   FinancialsResponse,
   LlamaAssetPool,
   LlamaLendBorrowPool,
-  LlamaPoolStat,
+  ProviderStatsResponse,
 } from '@x-fuji/sdk';
 
 import { DbKey } from './constants';
@@ -60,7 +60,7 @@ export async function saveStakingDataToDB(data: StakingResponse[]) {
 
 export async function saveProviderStatsToDB(
   poolId: string,
-  stats: LlamaPoolStat[]
+  stats: ProviderStatsResponse
 ) {
   try {
     const data = {

diff --git a/packages/sdk/src/entities/abstract/AbstractVault.ts b/packages/sdk/src/entities/abstract/AbstractVault.ts
@@ -3,7 +3,6 @@ import { JsonRpcProvider } from '@ethersproject/providers';
 import { keccak256 } from '@ethersproject/solidity';
 import { formatUnits } from '@ethersproject/units';
 import { IMulticallProvider } from '@hovoh/ethcall';
-import axios from 'axios';
 import { BigNumber, TypedDataDomain, TypedDataField, utils } from 'ethers';
 import invariant from 'tiny-invariant';
 
@@ -338,11 +337,8 @@ export abstract class AbstractVault {
 
       return new FujiResultSuccess(data);
     } catch (e) {
-      const message = axios.isAxiosError(e)
-        ? `DefiLlama API call failed with a message: ${e.message}`
-        : 'DefiLlama API call failed with an unexpected error!';
-      console.error(message);
-      return new FujiResultError(message, FujiErrorCode.API);
+      console.error(e);
+      return new FujiResultError(String(e), FujiErrorCode.API);
     }
   }
 

diff --git a/packages/sdk/src/functions/apiProviderStats.ts b/packages/sdk/src/functions/apiProviderStats.ts
@@ -3,19 +3,20 @@ import axios from 'axios';
 import { ApiRoute } from '../constants/api';
 import { FujiErrorCode } from '../constants/errors';
 import { FujiResultError, FujiResultSuccess } from '../entities/FujiError';
+import { LlamaPoolStat } from '../types';
 import { ProviderStatsResponse } from '../types/Api';
 import { FujiResultPromise } from '../types/FujiResult';
 
 export async function apiProviderStats(
   providerId: string
-): FujiResultPromise<ProviderStatsResponse> {
-  console.log(providerId);
+): FujiResultPromise<LlamaPoolStat[]> {
   try {
     const result = await axios
-      .get<ProviderStatsResponse>(`${ApiRoute.PROVIDER_STATS}/${providerId}`)
+      .get<ProviderStatsResponse>(
+        `${ApiRoute.PROVIDER_STATS}?poolId=${providerId}`
+      )
       .then(({ data }) => data);
-
-    return new FujiResultSuccess(result);
+    return new FujiResultSuccess(result.stats);
   } catch (e) {
     console.error(e);
     return new FujiResultError(

diff --git a/packages/sdk/src/types/Api.ts b/packages/sdk/src/types/Api.ts
@@ -14,4 +14,6 @@ export type FinancialsResponse = {
   pools: LlamaAssetPool[];
 };
 
-export type ProviderStatsResponse = LlamaPoolStat[];
+export type ProviderStatsResponse = {
+  stats: LlamaPoolStat[];
+};