Merge pull request #2624 from IntersectMBO/staging

GovTool - v2.0.5
IntersectMBO · Jan 10, 2025 · b201ae7 · b201ae7
2 parents e83412d + 418aaae
commit b201ae7
Show file tree

Hide file tree

Showing 27 changed files with 10,450 additions and 234 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -26,6 +26,26 @@ changes.
 
 -
 
+## [v2.0.5](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.5) 2025-01-10
+
+### Added
+
+-
+
+### Fixed
+
+- Fix counting submitted votes [Issue 2609](https://github.com/IntersectMBO/govtool/issues/2609)
+- Fix opening relative paths in external links
+- Fix passing random sorting to governance actions on disconnected wallet
+
+### Changed
+
+- Bump @intersect.mbo/pdf-ui to v0.5.6
+
+### Removed
+
+-
+
 ## [v2.0.4](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.4) 2025-01-07
 
 ### Added

diff --git a/govtool/backend/Dockerfile b/govtool/backend/Dockerfile
@@ -4,4 +4,4 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.4/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.5/x/vva-be/build/vva-be/vva-be /usr/local/bin
diff --git a/govtool/backend/Dockerfile.qovery b/govtool/backend/Dockerfile.qovery
@@ -4,7 +4,7 @@ FROM $BASE_IMAGE_REPO:$BASE_IMAGE_TAG
 WORKDIR /src
 COPY . .
 RUN cabal build
-RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.4/x/vva-be/build/vva-be/vva-be /usr/local/bin
+RUN cp dist-newstyle/build/x86_64-linux/ghc-9.2.7/vva-be-2.0.5/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

diff --git a/govtool/backend/sql/get-network-metrics.sql b/govtool/backend/sql/get-network-metrics.sql
@@ -83,6 +83,16 @@ total_stake_controlled_by_dreps AS (
         SUM(dd.amount)::bigint AS total
     FROM
         drep_distr dd
+    WHERE
+        dd.epoch_no = (SELECT no FROM current_epoch)
+),
+total_stake_controlled_by_spos AS (
+    SELECT
+        SUM(ps.stake)::bigint AS total
+    FROM
+        pool_stat ps
+    WHERE
+        ps.epoch_no = (SELECT no FROM current_epoch)
 ),
 total_registered_direct_voters AS (
     SELECT 
@@ -176,6 +186,7 @@ SELECT
     total_drep_votes.count as total_drep_votes,
     total_registered_dreps.unique_registrations as total_registered_dreps,
     COALESCE(total_stake_controlled_by_dreps.total, 0) as total_stake_controlled_by_dreps,
+    COALESCE(total_stake_controlled_by_spos.total, 0) as total_stake_controlled_by_spos,
     total_active_dreps.unique_active_drep_registrations as total_active_dreps,
     total_inactive_dreps.total_inactive_dreps as total_inactive_dreps,
     total_active_cip119_compliant_dreps.unique_active_cip119_compliant_drep_registrations as total_active_cip119_compliant_dreps,
@@ -192,6 +203,7 @@ FROM
     CROSS JOIN total_drep_votes
     CROSS JOIN total_registered_dreps
     CROSS JOIN total_stake_controlled_by_dreps
+    CROSS JOIN total_stake_controlled_by_spos
     CROSS JOIN total_active_dreps
     CROSS JOIN total_inactive_dreps
     CROSS JOIN total_active_cip119_compliant_dreps
@@ -208,6 +220,7 @@ GROUP BY
     total_drep_votes.count,
     total_registered_dreps.unique_registrations,
     total_stake_controlled_by_dreps.total,
+    total_stake_controlled_by_spos.total,
     total_active_dreps.unique_active_drep_registrations,
     total_inactive_dreps.total_inactive_dreps,
     total_active_cip119_compliant_dreps.unique_active_cip119_compliant_drep_registrations,