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

Nobids/hotfix total withdawal amount query #2665

Merged
merged 2 commits into from
Nov 3, 2023
Merged

Nobids/hotfix total withdawal amount query #2665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
475e25e
(NOBIDS) improve total withdawal amount query
peterbitfly Nov 3, 2023
f625efd
(NOBIDS) fix query
peterbitfly Nov 3, 2023
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
9 changes: 3 additions & 6 deletions handlers/api.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1581,8 +1581,6 @@ func apiValidator(w http.ResponseWriter, r *http.Request) {

data := make([]*ApiValidatorResponse, 0)

cutoffDay := utils.Config.Chain.ClConfig.CappellaForkEpoch/utils.EpochsPerDay() - 1

err = db.ReaderDb.Select(&data, `
WITH today AS (
SELECT
Expand All @@ -1596,10 +1594,9 @@ func apiValidator(w http.ResponseWriter, r *http.Request) {
stats AS (
SELECT
vs.validatorindex,
COALESCE(SUM(vs.withdrawals_amount), 0) as total_amount
COALESCE(vs.withdrawals_amount_total, 0) as total_amount
FROM validator_stats vs
WHERE vs.validatorindex = ANY($1) AND vs.day >= $3
GROUP BY vs.validatorindex
WHERE vs.validatorindex = ANY($1) AND vs.day = $3
),
withdrawals_summary AS (
SELECT
Expand All @@ -1623,7 +1620,7 @@ func apiValidator(w http.ResponseWriter, r *http.Request) {
LEFT JOIN withdrawals_summary ws ON ws.validatorindex = v.validatorindex
WHERE v.validatorindex = ANY($1)
ORDER BY v.validatorindex;
`, pq.Array(queryIndices), cutoffSlot, cutoffDay)
`, pq.Array(queryIndices), cutoffSlot, lastExportedDay)
if err != nil {
logger.Warnf("error retrieving validator data from db: %v", err)
sendErrorResponse(w, r.URL.String(), "could not retrieve db results")
Expand Down
Loading