Skip to content

Merge 'main' into 'develop' #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mschead merged 2 commits into from
Aug 29, 2025
Merged

Merge 'main' into 'develop' #467

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e107792
fix: dex metrics tvl history query
solidityteam Aug 28, 2025
083cf06
Merge pull request #466 from solidityteam/fix/dex-tvl-query
mschead Aug 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions indexer/src/kadena-server/repository/infra/repository/dex-metrics-db-repository.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,26 @@ export default class DexMetricsDbRepository implements DexMetricsRepository {

// Get TVL history
const tvlHistoryQuery = `
SELECT
date_trunc('day', pc.timestamp) as timestamp,
SUM(CAST(pc."tvlUsd" AS DECIMAL)) as value
FROM "PoolCharts" pc
JOIN "Pairs" p ON p.id = pc."pairId"
WHERE pc.timestamp BETWEEN $1 AND $2
AND p.address = $3
GROUP BY date_trunc('day', pc.timestamp)
ORDER BY timestamp ASC
SELECT
date_trunc('day', t.timestamp) AS timestamp,
SUM(CAST(t."tvlUsd" AS DECIMAL)) AS value
FROM (
SELECT
pc."pairId",
pc."tvlUsd",
pc."timestamp",
ROW_NUMBER() OVER (
PARTITION BY pc."pairId", date_trunc('day', pc."timestamp")
ORDER BY pc."timestamp" DESC
) as rn
FROM "PoolCharts" pc
JOIN "Pairs" p ON p.id = pc."pairId"
WHERE pc.timestamp BETWEEN $1 AND $2
AND p.address = $3
) t
WHERE t.rn = 1
GROUP BY date_trunc('day', t.timestamp)
ORDER BY timestamp ASC;
`;

const tvlHistory = await sequelize.query(tvlHistoryQuery, {
Expand Down