From 7322f7e24d8da676fdecce0535662e748fc25230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trung=20B=E1=BA=A1ch?= <66735837+trungbach@users.noreply.github.com> Date: Thu, 7 Mar 2024 12:19:57 +0700 Subject: [PATCH] fix: filter chart kwt-orai & liquidity oraix/usdc (#194) --- packages/oraidex-server/src/db-query.ts | 18 +++++++++++++++++- packages/oraidex-server/src/helper.ts | 2 +- packages/oraidex-server/tests/db-query.spec.ts | 17 +++++++++-------- packages/oraidex-server/tests/helper.spec.ts | 8 ++++---- packages/oraidex-sync/src/query.ts | 2 +- 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/packages/oraidex-server/src/db-query.ts b/packages/oraidex-server/src/db-query.ts index 81fe419f..bc3efc28 100644 --- a/packages/oraidex-server/src/db-query.ts +++ b/packages/oraidex-server/src/db-query.ts @@ -1,4 +1,11 @@ -import { BigDecimal, CW20_DECIMALS, oraichainTokens, parseTokenInfoRawDenom } from "@oraichain/oraidex-common"; +import { + BigDecimal, + CW20_DECIMALS, + KWT_CONTRACT, + ORAI, + oraichainTokens, + parseTokenInfoRawDenom +} from "@oraichain/oraidex-common"; import { DuckDb, PoolAmountHistory, SwapOperationData, parseAssetInfoOnlyDenom } from "@oraichain/oraidex-sync"; import { ARRANGED_PAIRS_CHART, AllPairsInfo, getAssetInfosFromPairString } from "./helper"; import "./polyfill"; @@ -169,6 +176,15 @@ export class DbQuery { value: liquidityInUsdt }); } + const KWT_ORAI_PAIR = `${KWT_CONTRACT}-${ORAI}`; + + // TODO: current harcode filter data for kwt-orai pair + if (pair === KWT_ORAI_PAIR) + return liquiditiesAvg.filter((item) => { + const itemTime = item?.time ? new Date(item.time) : null; + return itemTime && itemTime.getDate() > 1 && itemTime.getMonth() > 1 && itemTime.getFullYear() > 2023; + }); + return liquiditiesAvg; } diff --git a/packages/oraidex-server/src/helper.ts b/packages/oraidex-server/src/helper.ts index 2a60ce15..17e394d0 100644 --- a/packages/oraidex-server/src/helper.ts +++ b/packages/oraidex-server/src/helper.ts @@ -92,7 +92,7 @@ export type AllPairsInfo = { symbols: [string, string]; factoryV1?: boolean; }; -export const ARRANGED_PAIRS_CHART: AllPairsInfo[] = ARRANGED_PAIRS.map((pair) => { +export const ARRANGED_PAIRS_CHART: AllPairsInfo[] = PAIRS.map((pair) => { const assets = pair.asset_infos.map(parseAssetInfoOnlyDenom); return { ...pair, diff --git a/packages/oraidex-server/tests/db-query.spec.ts b/packages/oraidex-server/tests/db-query.spec.ts index f3c08d3e..31186269 100644 --- a/packages/oraidex-server/tests/db-query.spec.ts +++ b/packages/oraidex-server/tests/db-query.spec.ts @@ -85,7 +85,7 @@ describe("test-db-query", () => { ])("test-getSwapVolumeAllPair", async (type, expectedResult) => { // setup const PAIR_ORAIX_USDC = - "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge-orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd"; + "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd-orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge"; const PAIR_ORAI_USDT = "orai-orai12hzjxfh77wl572gdzct2fxv2arxcwh6gykc7qh"; const duckdb = await DuckDb.create(":memory:"); const dbQuery = new DbQuery(duckdb); @@ -324,8 +324,8 @@ describe("test-db-query", () => { toIconUrl: "1" }, { - firstAssetInfo: JSON.stringify({ token: { contract_addr: ORAIX_CONTRACT } }), - secondAssetInfo: JSON.stringify({ token: { contract_addr: USDC_CONTRACT } }), + firstAssetInfo: JSON.stringify({ token: { contract_addr: USDC_CONTRACT } }), + secondAssetInfo: JSON.stringify({ token: { contract_addr: ORAIX_CONTRACT } }), commissionRate: "1", pairAddr: pairAddrOraixUsdc, liquidityAddr: "2", @@ -339,7 +339,8 @@ describe("test-db-query", () => { // mock price orai = 1 usdt const coingeckoPrices = { "oraichain-token": 1, - oraidex: 1 + oraidex: 1, + "usd-coin": 1 }; cache.set(CACHE_KEY.COINGECKO_PRICES, coingeckoPrices); @@ -351,10 +352,10 @@ describe("test-db-query", () => { symbols: ["ORAI", "USDT"] }, { - symbol: "oraix/usdc", - info: `${ORAIX_CONTRACT}-${USDC_CONTRACT}`, - asset_infos: [ORAIX_INFO, USDC_INFO], - symbols: ["ORAIX", "USDC"] + symbol: "usdc/oraix", + info: `${USDC_CONTRACT}-${ORAIX_CONTRACT}`, + asset_infos: [USDC_INFO, ORAIX_INFO], + symbols: ["USDC", "ORAIX"] } ]; diff --git a/packages/oraidex-server/tests/helper.spec.ts b/packages/oraidex-server/tests/helper.spec.ts index 07715976..3ccca3a4 100644 --- a/packages/oraidex-server/tests/helper.spec.ts +++ b/packages/oraidex-server/tests/helper.spec.ts @@ -32,10 +32,10 @@ describe("test-helper", () => { "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd-orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge", [ { - token: { contract_addr: "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge" } + token: { contract_addr: "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd" } }, { - token: { contract_addr: "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd" } + token: { contract_addr: "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge" } } ] ], @@ -43,10 +43,10 @@ describe("test-helper", () => { "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge-orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd", [ { - token: { contract_addr: "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge" } + token: { contract_addr: "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd" } }, { - token: { contract_addr: "orai15un8msx3n5zf9ahlxmfeqd2kwa5wm0nrpxer304m9nd5q6qq0g6sku5pdd" } + token: { contract_addr: "orai1lus0f0rhx8s03gdllx2n6vhkmf0536dv57wfge" } } ] ] diff --git a/packages/oraidex-sync/src/query.ts b/packages/oraidex-sync/src/query.ts index ec44a9cd..be8a11b2 100644 --- a/packages/oraidex-sync/src/query.ts +++ b/packages/oraidex-sync/src/query.ts @@ -1,5 +1,5 @@ import { fromBinary, toBinary } from "@cosmjs/cosmwasm-stargate"; -import { Addr, MulticallQueryClient, MulticallReadOnlyInterface } from "@oraichain/common-contracts-sdk"; +import { Addr, MulticallQueryClient } from "@oraichain/common-contracts-sdk"; import { Call } from "@oraichain/common-contracts-sdk/build/Multicall.types"; import { AssetInfo,