Merge pull request #3146 from IntersectMBO/develop

GovTool - v2.0.14

Author: MSzalowski

CHANGELOG.md

@@ -18,8 +18,22 @@ changes.
 
 ### Removed
 
-## [v2.0.13](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.13) 2025-02-27
+## [v2.0.14](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.14) 2025-03-05
+
+
+### Added
+
+### Fixed
+
+- Fix calculating withdrawals when rewards records are empty for a given stake key [Issue 3134](https://github.com/IntersectMBO/govtool/issues/3134)
 
+### Changed
+
+### Removed
+
+- Remove ratification threshold for Info Action for Consitutional Committee [Issue 3108](https://github.com/IntersectMBO/govtool/issues/3108)
+
+## [v2.0.13](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.13) 2025-02-27
 
 ### Added
 

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.13/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.14/x/vva-be/build/vva-be/vva-be /usr/local/bin

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.13/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.14/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

govtool/backend/sql/get-stake-key-voting-power.sql

@@ -38,7 +38,15 @@ Withdrawal AS (
     w.addr_id
 )
 SELECT
-  (COALESCE(rr.amount, 0) + COALESCE(r.amount, 0) + COALESCE(b.amount, 0) - COALESCE(w.withdrawal_amount, 0)) AS total_balance,
+  (COALESCE(rr.amount, 0) + COALESCE(r.amount, 0) + COALESCE(b.amount, 0) - 
+  -- records in rewards tables might be missing for some epochs
+  -- so we need to check if the sum of rewards is greater than the sum of withdrawals before subtracting
+    CASE 
+      WHEN COALESCE(rr.amount, 0) + COALESCE(r.amount, 0) > COALESCE(w.withdrawal_amount, 0) 
+      THEN COALESCE(w.withdrawal_amount, 0) 
+      ELSE 0 
+    END
+  ) AS total_balance,
   b.addr_raw::text AS stake_address
 FROM
   Balance b

govtool/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.13
+version:            2.0.14
 
 -- A short (one-line) description of the package.
 -- synopsis:

govtool/frontend/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@govtool/frontend",
   "private": true,
-  "version": "2.0.13",
+  "version": "2.0.14",
   "type": "module",
   "scripts": {
     "build": "vite build",

govtool/frontend/package.json

@@ -207,7 +207,11 @@ export const VotesSubmitted = ({
             noVotesPercentage={ccNoVotesPercentage}
             notVotedVotes={ccNotVotedVotes}
             notVotedPercentage={ccNotVotedVotesPercentage}
-            threshold={Number(ccThreshold)}
+            threshold={
+              type !== GovernanceActionType.InfoAction
+                ? Number(ccThreshold)
+                : null
+            }
           />
         )}
       </Box>

govtool/frontend/src/components/molecules/VotesSubmitted.tsx

@@ -1,6 +1,6 @@
 {
   "name": "@govtool/metadata-validation",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "",
   "author": "",
   "private": true,