Skip to content
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

Fix balance and supply queries with block_num parameter #39

Merged
merged 1 commit into from
Jun 21, 2024
Merged

Fix balance and supply queries with block_num parameter #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 12 additions & 10 deletions src/usage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,21 @@ export async function makeUsageQuery(ctx: Context, endpoint: UsageEndpoints, use
// Need to narrow the type of `query_params` explicitly to access properties based on endpoint value
// See https://github.com/microsoft/TypeScript/issues/33014
const q = query_params as ValidUserParams<typeof endpoint>;
if (q.block_num)
if (q.block_num) {
query +=
`SELECT *`
+ ` FROM ${endpoint == "/balance" ? "balance_change_events" : "supply_change_events"}`
+ ` FINAL`;
else
+ ` FROM ${endpoint == "/balance" ? "balance_change_events" : "supply_change_events"}`;

query += ` ${filters} ORDER BY action_index DESC`;
query_params.limit = 1;
} else {
query +=
`SELECT *, updated_at_block_num AS block_num, updated_at_timestamp AS timestamp`
+ ` FROM ${endpoint == "/balance" ? "account_balances" : "token_supplies"}`
+ ` FINAL`;

query += ` ${filters}`;
query += ` ${filters} ORDER BY block_num DESC`;
}
} else if (endpoint == "/transfers") {
query += `SELECT * FROM `;

Expand All @@ -54,18 +57,17 @@ export async function makeUsageQuery(ctx: Context, endpoint: UsageEndpoints, use
query += `transfers_block_num`;
}

query += ` ${filters}`;
query += ` ${filters} ORDER BY block_num DESC`;
} else if (endpoint == "/holders") {
query += `SELECT account, value FROM (SELECT account, MAX(updated_at_block_num) AS last_updated FROM eos_tokens_v1.account_balances ${filters} GROUP BY account) AS x INNER JOIN eos_tokens_v1.account_balances AS y ON y.account = x.account AND y.updated_at_block_num = x.last_updated ${filters}`;
query += `SELECT account, value FROM (SELECT account, MAX(updated_at_block_num) AS last_updated FROM eos_tokens_v1.account_balances ${filters} GROUP BY account) AS x INNER JOIN eos_tokens_v1.account_balances AS y ON y.account = x.account AND y.updated_at_block_num = x.last_updated ${filters} ORDER BY value DESC`;
} else if (endpoint == "/head") {
query += `SELECT MAX(block_num) as block_num FROM cursors ${filters} GROUP BY id`;
} else if (endpoint == "/transfers/{trx_id}") {
query += `SELECT * FROM transfer_events ${filters}`;
query += `SELECT * FROM transfer_events ${filters} ORDER BY action_index`;
} else if (endpoint == "/tokens") {
query += `SELECT *, updated_at_block_num AS block_num FROM eos_tokens_v1.token_supplies FINAL ${filters}`;
query += `SELECT *, updated_at_block_num AS block_num FROM eos_tokens_v1.token_supplies FINAL ${filters} ORDER BY block_num DESC`;
}

query += endpoint == "/holders" ? " ORDER BY value DESC" : " ORDER BY block_num DESC";
query += " LIMIT {limit: int}";
query += " OFFSET {offset: int}";

Expand Down
Loading