Merge pull request #2612 from IntersectMBO/staging

GovTool - v2.0.4

Author: MSzalowski

CHANGELOG.md

@@ -26,6 +26,27 @@ changes.
 
 -
 
+## [v2.0.4](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.4) 2025-01-07
+
+### Added
+
+-
+
+### Fixed
+
+- Fix CIP-129 DRep view identifier for script based DReps [Issue 2583](https://github.com/IntersectMBO/govtool/issues/2583)
+- Fix fetching metadata from IPFS gateway
+- Fix bad request on passing the random sorting to GA list request [Issue 2535](https://github.com/IntersectMBO/govtool/issues/2535)
+- Fix wrong drep activity conditions
+
+### Changed
+
+- Reduce CSL version to 12.1.1 [Issue 2600](https://github.com/IntersectMBO/govtool/issues/2600)
+
+### Removed
+
+-
+
 ## [v2.0.3](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.3) 2024-12-30
 
 ### 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.3/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.4/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.3/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.4/x/vva-be/build/vva-be/vva-be /usr/local/bin
 
 # Expose the necessary port
 EXPOSE 9876

govtool/backend/sql/list-dreps.sql

@@ -17,6 +17,24 @@ DRepActivity AS (
   ORDER BY
     epoch_no DESC
   LIMIT 1
+),
+LatestVotingProcedure AS (
+  SELECT
+    vp.*,
+    ROW_NUMBER() OVER (PARTITION BY drep_voter ORDER BY tx_id DESC) AS rn
+  FROM
+    voting_procedure vp
+),
+LatestVoteEpoch AS (
+  SELECT
+    block.epoch_no,
+    lvp.drep_voter as drep_id
+  FROM
+    LatestVotingProcedure lvp
+    JOIN tx ON tx.id = lvp.tx_id
+    JOIN block ON block.id = tx.block_id
+  WHERE
+    lvp.rn = 1
 )
 SELECT DISTINCT ON (dh.raw)
   encode(dh.raw, 'hex'),
@@ -26,7 +44,7 @@ SELECT DISTINCT ON (dh.raw)
   encode(va.data_hash, 'hex'),
   dr_deposit.deposit,
   DRepDistr.amount,
-  (DRepActivity.epoch_no - newestRegister.epoch_no) <= DRepActivity.drep_activity AS active,
+  (DRepActivity.epoch_no - GREATEST(MAX(COALESCE(block.epoch_no, block_first_register.epoch_no)), lve.epoch_no)) <= DRepActivity.drep_activity AS active,
   encode(dr_voting_anchor.tx_hash, 'hex') AS tx_hash,
   newestRegister.time AS last_register_time,
   COALESCE(latestDeposit.deposit, 0),
@@ -143,6 +161,7 @@ FROM
   ) AS dr_first_register ON dr_first_register.drep_hash_id = dh.id AND dr_first_register.rn = 1
   LEFT JOIN tx AS tx_first_register ON tx_first_register.id = dr_first_register.tx_id
   LEFT JOIN block AS block_first_register ON block_first_register.id = tx_first_register.block_id
+  LEFT JOIN LatestVoteEpoch lve ON lve.drep_id = dh.id
 WHERE
   (
     COALESCE(?, '') = '' OR
@@ -163,6 +182,7 @@ GROUP BY
   DRepDistr.amount,
   DRepActivity.epoch_no,
   DRepActivity.drep_activity,
+  lve.epoch_no,
   dr_voting_anchor.tx_hash,
   newestRegister.time,
   newestRegister.epoch_no,

govtool/backend/vva-be.cabal

@@ -1,6 +1,6 @@
 cabal-version:      3.6
 name:               vva-be
-version:            2.0.3
+version:            2.0.4
 
 -- 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.3",
+  "version": "2.0.4",
   "type": "module",
   "scripts": {
     "build": "vite build",
@@ -25,7 +25,7 @@
   "dependencies": {
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
-    "@emurgo/cardano-serialization-lib-asmjs": "^13.1.0",
+    "@emurgo/cardano-serialization-lib-asmjs": "^12.1.1",
     "@hookform/resolvers": "^3.3.1",
     "@intersect.mbo/intersectmbo.org-icons-set": "^1.0.8",
     "@intersect.mbo/pdf-ui": "^0.5.5",
@@ -112,6 +112,5 @@
     "typescript": "^5.0.2",
     "nth-check": "^2.0.1",
     "postcss": "^8.4.31"
-  },
-  "_id": "[email protected]"
+  }
 }

govtool/frontend/package.json

@@ -34,6 +34,7 @@ export const DRepCard = ({
     metadataStatus,
     image,
     drepId,
+    isScriptBased,
   },
   isConnected,
   isDelegationLoading,
@@ -59,8 +60,8 @@ export const DRepCard = ({
     });
 
   const cip129Identifier = encodeCIP129Identifier({
-    txID: `22${drepId}`,
-    bech32Prefix: "drep",
+    txID: `${isScriptBased ? "23" : "22"}${drepId}`,
+    bech32Prefix: isScriptBased ? "drep_script" : "drep",
   });
 
   return (

…ano-serialization-lib-asmjs+13.2.0.patch …ano-serialization-lib-asmjs+12.1.1.patchgovtool/frontend/patches/@emurgo+cardano-serialization-lib-asmjs+13.2.0.patch renamed to govtool/frontend/patches/@emurgo+cardano-serialization-lib-asmjs+12.1.1.patch govtool/frontend/patches/@emurgo+cardano-serialization-lib-asmjs+13.2.0.patch renamed to govtool/frontend/patches/@emurgo+cardano-serialization-lib-asmjs+12.1.1.patch

@@ -47,6 +47,7 @@ export const DRepDetailsCard = ({
     view,
     drepId,
     votingPower,
+    isScriptBased,
   } = dRepData;
 
   const groupedReferences = references?.reduce<Record<string, Reference[]>>(
@@ -120,8 +121,8 @@ export const DRepDetailsCard = ({
         >
           <CopyableText
             value={encodeCIP129Identifier({
-              txID: `22${drepId}`,
-              bech32Prefix: "drep",
+              txID: `${isScriptBased ? "23" : "22"}${drepId}`,
+              bech32Prefix: isScriptBased ? "drep_script" : "drep",
             })}
             dataTestId="copy-cip-129-drep-id-button"
           />