Merge pull request #427 from TosiDrop/fix/token-info

fix: fix destructure failure when claim

.gitignore

@@ -25,3 +25,4 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+*.log

client/src/services/common.ts

@@ -4,7 +4,6 @@ import { PopUpInfo } from "src/entities/common.entities";
 import { Dto, GetPoolsDto, GetQueueDto } from "src/entities/dto";
 import { EpochParams, Tip } from "src/entities/koios.entities";
 import { ProjectData } from "src/entities/project.entities";
-import { GetTokens } from "src/entities/vm.entities";
 
 export async function getFeatures() {
   const response = await axios.get(`/features`);
@@ -75,11 +74,6 @@ export async function getQueue(): Promise<GetQueueDto> {
   return response.data;
 }
 
-export async function getTokens(): Promise<GetTokens> {
-  const response = await axios.get(`/api/gettokens`);
-  return response.data;
-}
-
 export async function createStakeTx(
   params: Dto.CreateDelegationTx["body"]
 ): Promise<Dto.CreateDelegationTx["response"]> {

server/index.ts

@@ -25,6 +25,7 @@ import TxRouter from "./routes/tx";
 import UtilRouter from "./routes/util";
 import {
   CardanoNetwork,
+  ITosiFeatures,
   getAccountsInfo,
   getDeliveredRewards,
   getEpochParams,
@@ -33,14 +34,12 @@ import {
   getPoolMetadata,
   getPools,
   getRewards,
-  getTokens,
-  ITosiFeatures,
   postFromKoios,
   sanitizeString,
   translateAdaHandle,
 } from "./utils";
 import { ICustomRewards } from "./utils/entities";
-import { createErrorWithCode, HttpStatusCode } from "./utils/error";
+import { HttpStatusCode, createErrorWithCode } from "./utils/error";
 require("dotenv").config();
 const openapi = require("@reqlez/express-openapi");
 const fs = require("fs");
@@ -147,15 +146,6 @@ app.get(
   })
 );
 
-app.get(
-  "/api/gettokens",
-  oapi.path(resp200Ok),
-  errorHandlerWrapper(async (_req: Request, res: Response) => {
-    const tokens = await getTokens();
-    return res.status(200).send(tokens);
-  })
-);
-
 app.get(
   "/api/getsettings",
   oapi.path(resp200Ok),

server/utils/helpers.ts

@@ -23,7 +23,7 @@ import {
 } from "../../client/src/entities/vm.entities";
 import { MinswapService } from "../service/minswap";
 import { longTermCache, shortTermCache } from "./cache";
-import { createErrorWithCode, HttpStatusCode } from "./error";
+import { HttpStatusCode, createErrorWithCode } from "./error";
 
 require("dotenv").config();
 
@@ -156,12 +156,24 @@ export async function getPools() {
   return pools;
 }
 
-export async function getTokens(): Promise<VmTokenInfoMap> {
-  let tokenInfo = longTermCache.get<VmTokenInfoMap>("tokenInfo");
-  if (tokenInfo == null) {
+export async function getTokens(options?: {
+  flushCache?: boolean;
+}): Promise<VmTokenInfoMap> {
+  let tokenInfo: VmTokenInfoMap;
+
+  if (options?.flushCache) {
     tokenInfo = await getFromVM<VmTokenInfoMap>("get_tokens");
     longTermCache.set("tokenInfo", tokenInfo);
+  } else {
+    const tempTokenInfo = longTermCache.get<VmTokenInfoMap>("tokenInfo");
+    if (tempTokenInfo == null) {
+      tokenInfo = await getFromVM<VmTokenInfoMap>("get_tokens");
+      longTermCache.set("tokenInfo", tokenInfo);
+    } else {
+      tokenInfo = tempTokenInfo;
+    }
   }
+
   return tokenInfo;
 }
 
@@ -213,7 +225,7 @@ export async function getPoolMetadata(accountInfo: any) {
 }
 
 export async function getRewards(stakeAddress: string) {
-  const [getRewardsResponse, tokens, prices] = await Promise.all([
+  let [getRewardsResponse, tokens, prices] = await Promise.all([
     getFromVM<GetRewardsDto>(`get_rewards&staking_address=${stakeAddress}`),
     getTokens(),
     MinswapService.getPrices(),
@@ -254,9 +266,21 @@ export async function getRewards(stakeAddress: string) {
     }
   });
 
+  /** if there is no token info in the map, flush the cache and re-fetch token info */
+  for (const assetId of [
+    ...Object.keys(consolidatedAvailableReward),
+    ...Object.keys(consolidatedAvailableRewardPremium),
+  ]) {
+    const token = tokens[assetId];
+    if (token == null) {
+      tokens = await getTokens({ flushCache: true });
+    }
+  }
+
   Object.keys(consolidatedAvailableReward).forEach((assetId) => {
     const token = tokens[assetId];
-    const { decimals: tokenDecimals, logo, ticker } = token;
+    /** add default values just to be safe */
+    const { decimals: tokenDecimals = 0, logo = "", ticker = "" } = token;
     const decimals = Number(tokenDecimals);
     const amount =
       consolidatedAvailableReward[assetId] / Math.pow(10, decimals);
@@ -277,7 +301,8 @@ export async function getRewards(stakeAddress: string) {
 
   Object.keys(consolidatedAvailableRewardPremium).forEach((assetId) => {
     const token = tokens[assetId];
-    const { decimals: tokenDecimals, logo, ticker } = token;
+    /** add default values just to be safe */
+    const { decimals: tokenDecimals = 0, logo = "", ticker = "" } = token;
     const decimals = Number(tokenDecimals);
     const amount =
       consolidatedAvailableRewardPremium[assetId] / Math.pow(10, decimals);