check for nil response data in numia tokens endpoint (#3847)

* check for nil response data * check volume & price * remove old token query * fix index * update type
osmosis-labs · Sep 18, 2024 · c0894d0 · c0894d0
1 parent 8956a00
commit c0894d0
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 104 deletions.
diff --git a/packages/server/src/queries/complex/assets/market.ts b/packages/server/src/queries/complex/assets/market.ts
@@ -231,14 +231,14 @@ function makeMarketActivityFromTokenData(tokenData: TokenData) {
         : undefined,
     denom: tokenData.denom,
     symbol: tokenData.symbol,
-    liquidity: new PricePretty(DEFAULT_VS_CURRENCY, tokenData.liquidity),
+    liquidity: new PricePretty(DEFAULT_VS_CURRENCY, tokenData.liquidity ?? 0),
     liquidity24hChange:
       tokenData.liquidity_24h_change !== null
         ? new RatePretty(
             new Dec(tokenData.liquidity_24h_change).quo(new Dec(100))
           )
         : undefined,
-    volume24h: new PricePretty(DEFAULT_VS_CURRENCY, tokenData.volume_24h),
+    volume24h: new PricePretty(DEFAULT_VS_CURRENCY, tokenData.volume_24h ?? 0),
     volume24hChange:
       tokenData.volume_24h_change !== null
         ? new RatePretty(new Dec(tokenData.volume_24h_change).quo(new Dec(100)))

diff --git a/packages/server/src/queries/complex/assets/price/providers/sidecar.ts b/packages/server/src/queries/complex/assets/price/providers/sidecar.ts
@@ -1,5 +1,6 @@
 import { Dec } from "@keplr-wallet/unit";
 import { Asset } from "@osmosis-labs/types";
+import { isNil } from "@osmosis-labs/utils";
 import cachified, { CacheEntry } from "cachified";
 import { LRUCache } from "lru-cache";
 
@@ -30,8 +31,8 @@ function getBatchLoader() {
     ttl: 1000 * 60 * 10, // 10 minutes
     getFreshValue: () =>
       new EdgeDataLoader(
-        (coinMinimalDenoms: readonly string[]) => {
-          return queryPrices(coinMinimalDenoms as string[]).then((priceMap) =>
+        (coinMinimalDenoms: readonly string[]) =>
+          queryPrices(coinMinimalDenoms as string[]).then((priceMap) =>
             coinMinimalDenoms.map((baseCoinMinimalDenom) => {
               try {
                 const price =
@@ -40,6 +41,12 @@ function getBatchLoader() {
                 // trim to 18 decimals to silence Dec warnings
                 const p = price.replace(/(\.\d{18})\d*/, "$1");
 
+                if (isNil(p)) {
+                  return new Error(
+                    `No SQS price result for ${baseCoinMinimalDenom} and USDC`
+                  );
+                }
+
                 if (new Dec(p).isZero())
                   return new Error(
                     `No SQS price result for ${baseCoinMinimalDenom} and USDC`
@@ -51,8 +58,7 @@ function getBatchLoader() {
                 );
               }
             })
-          );
-        },
+          ),
         {
           // SQS imposes a limit on URI length from its Nginx configuration, so we impose a limit to avoid hitting that limit.
           maxBatchSize: 100,

diff --git a/packages/server/src/queries/data-services/token-data.ts b/packages/server/src/queries/data-services/token-data.ts
@@ -7,9 +7,9 @@ export interface TokenData {
   denom: string;
   symbol: string;
   main: boolean;
-  liquidity: number;
+  liquidity: number | null;
   liquidity_24h_change: number | null;
-  volume_24h: number;
+  volume_24h: number | null;
   volume_24h_change: number | null;
   name: string;
   price_1h_change: number | null;

diff --git a/packages/stores/src/queries-external/index.ts b/packages/stores/src/queries-external/index.ts
@@ -7,7 +7,6 @@ export * from "./pool-fees";
 export * from "./pool-rewards";
 export * from "./pools";
 export * from "./store";
-export * from "./token-data";
 export * from "./token-historical-chart";
 
 export const IMPERATOR_TIMESERIES_DEFAULT_BASEURL =

diff --git a/packages/stores/src/queries-external/store.ts b/packages/stores/src/queries-external/store.ts
@@ -24,7 +24,6 @@ import { ObservableQueryPoolAprs } from "./numia";
 import { ObservableQueryPoolFeesMetrics } from "./pool-fees";
 import { ObservableQueryAccountsPoolRewards } from "./pool-rewards";
 import { ObservableQueryPositionsPerformanceMetrics } from "./position-performance";
-import { ObservableQueryTokensData } from "./token-data";
 import { ObservableQueryTokensHistoricalChart } from "./token-historical-chart";
 import { ObservableQueryMarketCap } from "./token-market-cap";
 
@@ -35,7 +34,6 @@ export class QueriesExternalStore {
   public readonly queryChainStatus: DeepReadonly<ObservableQueryIbcChainsStatus>;
   public readonly queryMarketCaps: DeepReadonly<ObservableQueryMarketCaps>;
   public readonly queryTokenHistoricalChart: DeepReadonly<ObservableQueryTokensHistoricalChart>;
-  public readonly queryTokenData: DeepReadonly<ObservableQueryTokensData>;
   public readonly queryActiveGauges: DeepReadonly<ObservableQueryActiveGauges>;
   public readonly queryICNSNames: DeepReadonly<ObservableQueryICNSNames>;
   public readonly queryPositionsPerformaceMetrics: DeepReadonly<ObservableQueryPositionsPerformanceMetrics>;
@@ -90,11 +88,6 @@ export class QueriesExternalStore {
       kvStore,
       indexerDataBaseUrl
     );
-    this.queryTokenData = new ObservableQueryTokensData(
-      kvStore,
-      priceStore,
-      timeseriesDataBaseUrl
-    );
     this.queryActiveGauges = new ObservableQueryActiveGauges(
       kvStore,
       webApiBaseUrl,

diff --git a/packages/stores/src/queries-external/token-data/index.ts b/packages/stores/src/queries-external/token-data/index.ts
diff --git a/packages/stores/src/queries-external/token-data/types.ts b/packages/stores/src/queries-external/token-data/types.ts