Merge pull request #3283 from IntersectMBO/develop

MSzalowski · web-flow · commit 15544c3d58d0 · 2025-03-26T13:56:03.000+01:00
GovTool - v2.0.18
diff --git a/.github/workflows/test_backend.yml b/.github/workflows/test_backend.yml
@@ -162,7 +162,7 @@ jobs:
 
   publish-status:
     runs-on: ubuntu-latest
-    if: always()
+    if: always() && needs.backend-tests.result != 'skipped'
     needs: [backend-tests, publish-report]
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/test_integration_playwright.yml b/.github/workflows/test_integration_playwright.yml
@@ -202,7 +202,7 @@ jobs:
 
   publish-status:
     runs-on: ubuntu-latest
-    if: always()
+    if: always() && needs.integration-tests.result != 'skipped'
     needs: [integration-tests, publish-report]
     steps:
       - uses: actions/checkout@v4
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -18,12 +18,14 @@ changes.
 
 ### Removed
 
-## [v2.0.18](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.18) 2025-03-25
+## [v2.0.18](https://github.com/IntersectMBO/govtool/releases/tag/v2.0.18) 2025-03-26
 
 ### Added
 
 - Add redirection to outcomes when proposal is not found [Issue 3230](https://github.com/IntersectMBO/govtool/issues/3230)
-- Add drep voting power list endpoint [Issue 3263](https://github.com/IntersectMBO/govtool/issues/3263)
+- Add DRep voting power list endpoint [Issue 3263](https://github.com/IntersectMBO/govtool/issues/3263)
+- Add DRep given name to the voting power list endpoint [Issue 3273](https://github.com/IntersectMBO/govtool/issues/3273)
+- Add DRep voting power list query to PDF Pillar [Issue 3277](https://github.com/IntersectMBO/govtool/issues/3277)
 
 ### Fixed
 
diff --git a/govtool/backend/sql/get-dreps-voting-power-list.sql b/govtool/backend/sql/get-dreps-voting-power-list.sql
@@ -1,6 +1,37 @@
+WITH LatestExistingVotingAnchor AS (
+  SELECT
+    subquery.drep_registration_id,
+    subquery.drep_hash_id,
+    subquery.voting_anchor_id,
+    subquery.url,
+    subquery.metadata_hash,
+    subquery.ocvd_id
+  FROM (
+    SELECT
+      dr.id AS drep_registration_id,
+      dr.drep_hash_id,
+      va.id AS voting_anchor_id,
+      va.url,
+      encode(va.data_hash, 'hex') AS metadata_hash,
+      ocvd.id AS ocvd_id,
+      ROW_NUMBER() OVER (PARTITION BY dr.drep_hash_id ORDER BY dr.tx_id DESC) AS rn
+    FROM
+      drep_registration dr
+    JOIN voting_anchor va ON dr.voting_anchor_id = va.id
+    JOIN off_chain_vote_data ocvd ON va.id = ocvd.voting_anchor_id
+    WHERE
+      ocvd.voting_anchor_id IS NOT NULL
+  ) subquery
+  WHERE
+    subquery.rn = 1
+)
 SELECT DISTINCT ON (raw)
   view, 
   encode(raw, 'hex') AS hash_raw,
-  COALESCE(dd.amount, 0) AS voting_power
+  COALESCE(dd.amount, 0) AS voting_power,
+  ocvdd.given_name
 FROM drep_hash dh
-LEFT JOIN drep_distr dd ON dh.id = dd.hash_id AND dd.epoch_no = (SELECT MAX(no) from epoch)
+LEFT JOIN drep_distr dd ON dh.id = dd.hash_id AND dd.epoch_no = (SELECT MAX(no) from epoch)
+LEFT JOIN LatestExistingVotingAnchor leva ON leva.drep_hash_id = dh.id
+LEFT JOIN off_chain_vote_data ocvd ON ocvd.id = leva.ocvd_id
+LEFT JOIN off_chain_vote_drep_data ocvdd ON ocvdd.off_chain_vote_data_id = ocvd.id
diff --git a/govtool/backend/sql/get-filtered-dreps-voting-power.sql b/govtool/backend/sql/get-filtered-dreps-voting-power.sql
@@ -1,7 +1,38 @@
+WITH LatestExistingVotingAnchor AS (
+  SELECT
+    subquery.drep_registration_id,
+    subquery.drep_hash_id,
+    subquery.voting_anchor_id,
+    subquery.url,
+    subquery.metadata_hash,
+    subquery.ocvd_id
+  FROM (
+    SELECT
+      dr.id AS drep_registration_id,
+      dr.drep_hash_id,
+      va.id AS voting_anchor_id,
+      va.url,
+      encode(va.data_hash, 'hex') AS metadata_hash,
+      ocvd.id AS ocvd_id,
+      ROW_NUMBER() OVER (PARTITION BY dr.drep_hash_id ORDER BY dr.tx_id DESC) AS rn
+    FROM
+      drep_registration dr
+    JOIN voting_anchor va ON dr.voting_anchor_id = va.id
+    JOIN off_chain_vote_data ocvd ON va.id = ocvd.voting_anchor_id
+    WHERE
+      ocvd.voting_anchor_id IS NOT NULL
+  ) subquery
+  WHERE
+    subquery.rn = 1
+)
 SELECT DISTINCT ON (raw)
   view, 
   encode(raw, 'hex') AS hash_raw,
-  COALESCE(dd.amount, 0) AS voting_power
+  COALESCE(dd.amount, 0) AS voting_power,
+  ocvdd.given_name
 FROM drep_hash dh
 LEFT JOIN drep_distr dd ON dh.id = dd.hash_id AND dd.epoch_no = (SELECT MAX(no) from epoch)
+LEFT JOIN LatestExistingVotingAnchor leva ON leva.drep_hash_id = dh.id
+LEFT JOIN off_chain_vote_data ocvd ON ocvd.id = leva.ocvd_id
+LEFT JOIN off_chain_vote_drep_data ocvdd ON ocvdd.off_chain_vote_data_id = ocvd.id
 WHERE view = ? OR encode(raw, 'hex') = ?
diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
@@ -346,6 +346,7 @@ drepVotingPowerList identifiers = do
         { drepVotingPowerListResponseView = drepView
         , drepVotingPowerListResponseHashRaw = HexText drepHashRaw
         , drepVotingPowerListResponseVotingPower = drepVotingPower
+        , drepVotingPowerListResponseGivenName = drepGivenName
         }
 
 getCurrentDelegation :: App m => HexText -> m (Maybe DelegationResponse)
diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
@@ -627,6 +627,7 @@ data DRepVotingPowerListResponse
       { drepVotingPowerListResponseView        :: Text
       , drepVotingPowerListResponseHashRaw     :: HexText
       , drepVotingPowerListResponseVotingPower :: Integer
+      , drepVotingPowerListResponseGivenName   :: Maybe Text
       }
   deriving (Generic, Show)
 
@@ -636,7 +637,8 @@ exampleDRepVotingPowerListResponse :: Text
 exampleDRepVotingPowerListResponse =
     "{\"view\": \"drep1qq5n7k0r0ff6lf4qvndw9t7vmdqa9y3q9qtjq879rrk9vcjcdy8a4xf92mqsajf9u3nrsh3r6zrp29kuydmfq45fz88qpzmjkc\","
   <> "\"hashRaw\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\","
-  <> "\"votingPower\": 1000000}"
+  <> "\"votingPower\": 1000000,"
+  <> "\"givenName\": \"John Doe\"}"
 
 instance ToSchema DRepVotingPowerListResponse where
   declareNamedSchema proxy = do
diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
@@ -222,7 +222,7 @@ getDRepsVotingPowerList identifiers = withPool $ \conn -> do
       return $ concat resultsPerIdentifier
   
   return
-    [ DRepVotingPowerList view hashRaw votingPower
-    | (view, hashRaw, votingPower') <- results
+    [ DRepVotingPowerList view hashRaw votingPower givenName
+    | (view, hashRaw, votingPower', givenName) <- results
     , let votingPower = floor @Scientific votingPower'
     ]
diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
@@ -101,6 +101,7 @@ data DRepVotingPowerList
       { drepView        :: Text
       , drepHashRaw     :: Text
       , drepVotingPower :: Integer
+      , drepGivenName   :: Maybe Text
       }
   deriving (Show, Eq)
 
diff --git a/govtool/frontend/src/consts/queryKeys.ts b/govtool/frontend/src/consts/queryKeys.ts
@@ -13,6 +13,7 @@ export const QUERY_KEYS = {
   useGetProposalsInfiniteKey: "useGetProposalsInfiniteKey",
   useGetProposalsKey: "useGetProposalsKey",
   useGetVoteContextFromFile: "useGetVoteContextFromFile",
+  useGetDRepVotingPowerListKey: "useGetDRepVotingPowerListKey",
 };
 
 export const MUTATION_KEYS = {
diff --git a/govtool/frontend/src/hooks/queries/index.ts b/govtool/frontend/src/hooks/queries/index.ts
@@ -13,3 +13,4 @@ export * from "./useGetProposalsInfiniteQuery";
 export * from "./useGetProposalsQuery";
 export * from "./useGetVoteContextTextFromFile";
 export * from "./useGetVoterInfoQuery";
+export * from "./useGetDRepVotingPowerList";
diff --git a/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerList.ts b/govtool/frontend/src/hooks/queries/useGetDRepVotingPowerList.ts
@@ -0,0 +1,32 @@
+import { useQuery, useQueryClient } from "react-query";
+import { getDRepVotingPowerList } from "@/services";
+import { QUERY_KEYS } from "@/consts";
+
+export const useGetDRepVotingPowerList = () => {
+  const queryClient = useQueryClient();
+
+  const {
+    data: dRepVotingPowerList,
+    isError,
+    error,
+    isLoading,
+  } = useQuery({
+    queryKey: [QUERY_KEYS.useGetDRepVotingPowerListKey],
+    queryFn: () => getDRepVotingPowerList([]),
+    enabled: false,
+  });
+
+  const fetchDRepVotingPowerList = async (identifiers: string[]) =>
+    queryClient.fetchQuery({
+      queryKey: [QUERY_KEYS.useGetDRepVotingPowerListKey],
+      queryFn: () => getDRepVotingPowerList(identifiers),
+    });
+
+  return {
+    dRepVotingPowerList,
+    fetchDRepVotingPowerList,
+    isError,
+    error,
+    isLoading,
+  };
+};
diff --git a/govtool/frontend/src/models/api.ts b/govtool/frontend/src/models/api.ts
@@ -265,3 +265,12 @@ export type Infinite<T> = {
   pageSize: number;
   total: number;
 };
+
+type DRepVotingPower = {
+  view: string;
+  hashRaw: string;
+  votingPower: number;
+  givenName: string | null;
+};
+
+export type DRepVotingPowerListResponse = DRepVotingPower[];
diff --git a/govtool/frontend/src/pages/ProposalDiscussion.tsx b/govtool/frontend/src/pages/ProposalDiscussion.tsx
@@ -5,7 +5,7 @@ import { useCardano, useGovernanceActions } from "@/context";
 import { useValidateMutation } from "@/hooks/mutations";
 import { useScreenDimension } from "@/hooks/useScreenDimension";
 import { Footer, TopNav } from "@/components/organisms";
-import { useGetVoterInfo } from "@/hooks";
+import { useGetDRepVotingPowerList, useGetVoterInfo } from "@/hooks";
 
 const ProposalDiscussion = React.lazy(
   () => import("@intersect.mbo/pdf-ui/cjs"),
@@ -17,6 +17,7 @@ export const ProposalDiscussionPillar = () => {
   const { walletApi, ...context } = useCardano();
   const { voter } = useGetVoterInfo();
   const { createGovernanceActionJsonLD, createHash } = useGovernanceActions();
+  const { fetchDRepVotingPowerList } = useGetDRepVotingPowerList();
 
   return (
     <Box
@@ -65,6 +66,7 @@ export const ProposalDiscussionPillar = () => {
                 typeof ProposalDiscussion
               >["validateMetadata"]
             }
+            fetchDRepVotingPowerList={fetchDRepVotingPowerList}
           />
         </Suspense>
       </Box>
diff --git a/govtool/frontend/src/services/index.ts b/govtool/frontend/src/services/index.ts
@@ -1,3 +1,3 @@
 export * from "./API";
 
-export * from "./requests/index";
+export * from "./requests";
diff --git a/govtool/frontend/src/services/requests/getDRepVotingPowerList.ts b/govtool/frontend/src/services/requests/getDRepVotingPowerList.ts
@@ -0,0 +1,15 @@
+import { DRepVotingPowerListResponse } from "@/models";
+import { API } from "../API";
+
+export const getDRepVotingPowerList = async (
+  identifiers: string[],
+): Promise<DRepVotingPowerListResponse> => {
+  const params = new URLSearchParams();
+  identifiers.forEach((id: string) => params.append("identifiers", id));
+
+  const response = await API.get<DRepVotingPowerListResponse>(
+    `/drep/voting-power-list?${params.toString()}`,
+  );
+
+  return response.data;
+};
diff --git a/govtool/frontend/src/services/requests/index.ts b/govtool/frontend/src/services/requests/index.ts
@@ -21,3 +21,4 @@ export * from "./postDRepRegister";
 export * from "./postDRepRemoveVote";
 export * from "./postDRepRetire";
 export * from "./postDRepVote";
+export * from "./getDRepVotingPowerList";
diff --git a/govtool/frontend/src/types/@intersect.mbo.d.ts b/govtool/frontend/src/types/@intersect.mbo.d.ts
@@ -24,6 +24,9 @@ type ProposalDiscussionProps = {
     | { status?: MetadataValidationStatus; metadata?: any; valid: boolean }
     | undefined
   >;
+  fetchDRepVotingPowerList: (
+    identifiers: string[],
+  ) => Promise<DRepVotingPowerListResponse>;
 };
 
 type GovernanceActionsOutcomesProps = {
diff --git a/govtool/frontend/src/utils/mapDtoToDrep.ts b/govtool/frontend/src/utils/mapDtoToDrep.ts
@@ -32,6 +32,8 @@ export const mapDtoToDrep = async (dto: DrepDataDTO): Promise<DRepData> => {
   let base64Image = null;
   const isIPFSImage = dto.imageUrl?.startsWith("ipfs://") || false;
   if (dto.imageUrl) {
+    // eslint-disable-next-line no-console
+    console.debug("Fetching image", dto.imageUrl);
     fetch(
       isIPFSImage
         ? `${import.meta.env.VITE_IPFS_GATEWAY}/${dto.imageUrl?.slice(7)}`
diff --git a/govtool/frontend/src/utils/openInNewTab.ts b/govtool/frontend/src/utils/openInNewTab.ts
@@ -7,6 +7,10 @@ export const openInNewTab = (url: string) => {
       ? `${import.meta.env.VITE_IPFS_GATEWAY}/${url.slice(7)}`
       : `https://${url}`;
 
+  // eslint-disable-next-line no-console
+  console.debug("Opening in new tab", fullUrl);
+
+  // Open the URL in a new tab
   const newWindow = window.open(fullUrl, "_blank", "noopener,noreferrer");
   if (newWindow) newWindow.opener = null;
 };

Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,7 @@ drepVotingPowerList identifiers = do`
`346`	`346`	`{ drepVotingPowerListResponseView = drepView`
`347`	`347`	`, drepVotingPowerListResponseHashRaw = HexText drepHashRaw`
`348`	`348`	`, drepVotingPowerListResponseVotingPower = drepVotingPower`
	`349`	`+ , drepVotingPowerListResponseGivenName = drepGivenName`
`349`	`350`	`}`
`350`	`351`
`351`	`352`	`getCurrentDelegation :: App m => HexText -> m (Maybe DelegationResponse)`
Original file line number	Diff line number	Diff line change
`@@ -222,7 +222,7 @@ getDRepsVotingPowerList identifiers = withPool $ \conn -> do`
`222`	`222`	`return $ concat resultsPerIdentifier`
`223`	`223`
`224`	`224`	`return`
`225`		`- [ DRepVotingPowerList view hashRaw votingPower`
`226`		`- \| (view, hashRaw, votingPower') <- results`
	`225`	`+ [ DRepVotingPowerList view hashRaw votingPower givenName`
	`226`	`+ \| (view, hashRaw, votingPower', givenName) <- results`
`227`	`227`	`, let votingPower = floor @Scientific votingPower'`
`228`	`228`	`]`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ data DRepVotingPowerList`
`101`	`101`	`{ drepView :: Text`
`102`	`102`	`, drepHashRaw :: Text`
`103`	`103`	`, drepVotingPower :: Integer`
	`104`	`+ , drepGivenName :: Maybe Text`
`104`	`105`	`}`
`105`	`106`	`deriving (Show, Eq)`
`106`	`107`