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(#2125): fix counting Governance Action expiration #2163

Merged
merged 4 commits into from
Oct 16, 2024
Merged

fix(#2125): fix counting Governance Action expiration #2163

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
982f1e7
fix(#2125): fix counting Governance Action expiration
MSzalowski Oct 16, 2024
2d10730
Merge pull request #2160 from IntersectMBO/fix/fix-gov-action-expirat…
MSzalowski Oct 16, 2024
78b5379
Merge pull request #2161 from IntersectMBO/develop
MSzalowski Oct 16, 2024
d0d14b1
Merge pull request #2162 from IntersectMBO/test
MSzalowski Oct 16, 2024
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
24 changes: 9 additions & 15 deletions govtool/backend/sql/list-proposals.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@ WITH LatestDrepDistr AS (
FROM
drep_distr
),
EpochUtils AS (
LatestEpoch AS (
SELECT
(Max(end_time) - Min(end_time)) /(Max(NO) - Min(NO)) AS epoch_duration,
Max(NO) AS last_epoch_no,
Max(end_time) AS last_epoch_end_time
start_time,
no
FROM
epoch
epoch ORDER BY no DESC LIMIT 1
),
always_no_confidence_voting_power AS (
SELECT
Expand Down Expand Up @@ -56,13 +55,9 @@ SELECT
) as description,
CASE
WHEN meta.network_name::text = 'mainnet' THEN
epoch_utils.last_epoch_end_time +
epoch_utils.epoch_duration * (gov_action_proposal.expiration - epoch_utils.last_epoch_no)::bigint +
INTERVAL '5 days'
latest_epoch.start_time + (gov_action_proposal.expiration - latest_epoch.no)::bigint * INTERVAL '5 days' + INTERVAL '5 days'
ELSE
epoch_utils.last_epoch_end_time +
epoch_utils.epoch_duration * (gov_action_proposal.expiration - epoch_utils.last_epoch_no)::bigint +
INTERVAL '1 day'
latest_epoch.start_time + (gov_action_proposal.expiration - latest_epoch.no)::bigint * INTERVAL '1 day' + INTERVAL '1 day'
END AS expiry_date,
gov_action_proposal.expiration,
creator_block.time,
Expand Down Expand Up @@ -101,7 +96,7 @@ FROM
on gov_action_proposal.id = treasury_withdrawal.gov_action_proposal_id
LEFT JOIN stake_address
on stake_address.id = treasury_withdrawal.stake_address_id
CROSS JOIN EpochUtils AS epoch_utils
CROSS JOIN LatestEpoch AS latest_epoch
CROSS JOIN always_no_confidence_voting_power
CROSS JOIN always_abstain_voting_power
CROSS JOIN meta
Expand Down Expand Up @@ -162,9 +157,8 @@ GROUP BY
gov_action_proposal.index,
creator_tx.hash,
creator_block.time,
epoch_utils.epoch_duration,
epoch_utils.last_epoch_no,
epoch_utils.last_epoch_end_time,
latest_epoch.start_time,
latest_epoch.no,
proposal_params,
voting_anchor.url,
voting_anchor.data_hash,
Expand Down
Loading