Merge pull request #381 from IntersectMBO/develop

test: #320 #350 #351 #223

.github/workflows/build-and-deploy.yml

@@ -174,6 +174,7 @@ jobs:
       - name: Notify on Slack
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.DEPLOY_NOTIFY_SLACK_WEBHOOK_URL }}
+          PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
         run: |
           if [[ "${{ inputs.environment }}" == "staging" ]]; then export DOMAIN=staging.govtool.byron.network; fi;
           if [[ "${{ inputs.environment }}" == "beta" ]]; then export DOMAIN=sanchogov.tools; fi;

CHANGELOG.md

@@ -34,6 +34,7 @@ changes.
 - Fixed CSP settings to allow error reports with Sentry [Issue 291](https://github.com/IntersectMBO/govtool/issues/291).
 
 ### Changed
+- `drep/list` and `drep/info` endpoints now return additional data such as metadata url and hash, and voting power [Issue 223](https://github.com/IntersectMBO/govtool/issues/223)
 - `isRegistered` and `wasRegistered` fields in the drep/info endpoint changed to `isRegisteredAsDRep` and `wasRegisteredAsDRep` respectively [Issue 212](https://github.com/IntersectMBO/govtool/issues/212)
 - Update Cardano-Serialization-Lib to 12.0.0-alpha.16 [Issue 156](https://github.com/IntersectMBO/govtool/issues/156)
 - Changed and improved working conventions docs, PR template and codeowners file, addressing [Issue 88](https://github.com/IntersectMBO/govtool/issues/88).

README.md

@@ -23,6 +23,7 @@ Learn more; [docs.sanchogov.tools](https://docs.sanchogov.tools/).
 ## 📍 Navigation
 - [GovTool Backend](./govtool/backend/README.md)
 - [GovTool Frontend](./govtool/frontend/README.md)
+- [GovTool deployment setup](./scripts/govtool/README.md)
 - [Documentation](./docs/)
 - [Tests](./tests/)
 

govtool/backend/sql/get-drep-info.sql

@@ -71,16 +71,36 @@ WasRegisteredAsSoleVoter AS (
                 WHERE
                     drep_hash.raw = DRepId.raw
                     AND drep_registration.voting_anchor_id IS NULL)) AS value
+), CurrentMetadata AS (
+    SELECT voting_anchor.url as url, encode(voting_anchor.data_hash, 'hex') as data_hash
+    FROM LatestRegistrationEntry
+    LEFT JOIN voting_anchor
+    ON voting_anchor.id = LatestRegistrationEntry.voting_anchor_id
+    LIMIT 1
+), CurrentVotingPower AS (
+    SELECT amount as amount
+    FROM drep_hash
+    JOIN DRepId
+    ON drep_hash.raw = DRepId.raw
+    LEFT JOIN drep_distr
+    ON drep_distr.hash_id = drep_hash.id
+    ORDER BY drep_distr.epoch_no DESC
+    LIMIT 1
 )
 SELECT
     IsRegisteredAsDRep.value,
     WasRegisteredAsDRep.value,
     IsRegisteredAsSoleVoter.value,
     WasRegisteredAsSoleVoter.value,
-    CurrentDeposit.value
+    CurrentDeposit.value,
+    CurrentMetadata.url,
+    CurrentMetadata.data_hash,
+    CurrentVotingPower.amount
 FROM
     IsRegisteredAsDRep
     CROSS JOIN IsRegisteredAsSoleVoter
     CROSS JOIN WasRegisteredAsDRep
     CROSS JOIN WasRegisteredAsSoleVoter
     CROSS JOIN CurrentDeposit
+    CROSS JOIN CurrentMetadata
+    CROSS JOIN CurrentVotingPower

govtool/backend/sql/list-dreps.sql

@@ -1,8 +1,18 @@
+WITH DRepDistr AS (
+  SELECT
+    *,
+    ROW_NUMBER() OVER(PARTITION BY drep_hash.id ORDER BY drep_distr.epoch_no DESC) AS rn
+  FROM drep_distr
+  JOIN drep_hash
+  on drep_hash.id = drep_distr.hash_id
+)
+
 SELECT
    encode(dh.raw, 'hex'),
    va.url,
    encode(va.data_hash, 'hex'),
-   dr_deposit.deposit
+   dr_deposit.deposit,
+   DRepDistr.amount
 FROM drep_hash dh
 JOIN (
   SELECT dr.id, dr.drep_hash_id, dr.deposit,
@@ -18,4 +28,5 @@ LEFT JOIN (
 ) as dr_voting_anchor
 on dr_voting_anchor.drep_hash_id = dh.id and dr_voting_anchor.rn = 1
 left JOIN voting_anchor va ON va.id = dr_voting_anchor.voting_anchor_id
-
+LEFT JOIN DRepDistr
+on DRepDistr.hash_id = dh.id and DRepDistr.rn = 1

govtool/backend/src/VVA/API.hs

@@ -71,7 +71,7 @@ server = drepList
 drepList :: App m => m [DRep]
 drepList = do
   CacheEnv {dRepListCache} <- asks vvaCache
-  map (\(Types.DRepRegistration drep_hash url data_hash deposit) -> DRep (DRepHash drep_hash) url data_hash deposit)
+  map (\(Types.DRepRegistration drep_hash url data_hash deposit votingPower) -> DRep (DRepHash drep_hash) url data_hash deposit votingPower)
     <$> cacheRequest dRepListCache () DRep.listDReps
 
 getVotingPower :: App m => HexText -> m Integer
@@ -158,6 +158,9 @@ drepInfo (unHexText -> dRepId) = do
     , dRepInfoResponseIsRegisteredAsSoleVoter = dRepInfoIsRegisteredAsSoleVoter
     , dRepInfoResponseWasRegisteredAsSoleVoter = dRepInfoWasRegisteredAsSoleVoter
     , dRepInfoResponseDeposit = dRepInfoDeposit
+    , dRepInfoResponseUrl = dRepInfoUrl
+    , dRepInfoResponseDataHash = HexText <$> dRepInfoDataHash
+    , dRepInfoResponseVotingPower = dRepInfoVotingPower
     }
 
 getCurrentDelegation :: App m => HexText -> m (Maybe HexText)

govtool/backend/src/VVA/API/Types.hs

@@ -380,6 +380,9 @@ data DRepInfoResponse = DRepInfoResponse
   , dRepInfoResponseIsRegisteredAsSoleVoter :: Bool
   , dRepInfoResponseWasRegisteredAsSoleVoter :: Bool
   , dRepInfoResponseDeposit :: Maybe Integer
+  , dRepInfoResponseUrl :: Maybe Text
+  , dRepInfoResponseDataHash :: Maybe HexText
+  , dRepInfoResponseVotingPower :: Maybe Integer
   } deriving (Generic, Show)
 
 deriveJSON (jsonOptions "dRepInfoResponse") ''DRepInfoResponse
@@ -390,7 +393,10 @@ exampleDRepInfoResponse =
   <> "\"wasRegisteredAsDRep\": true,"
   <> "\"isRegisteredAsSoleVoter\": true,"
   <> "\"wasRegisteredAsSoleVoter\": true,"
-  <> "\"deposit\": 2000000}"
+  <> "\"deposit\": 2000000,"
+  <> "\"url\": \"https://drep.metadata.xyz\","
+  <> "\"dataHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\","
+  <> "\"votingPower\": 1000000}"
 
 instance ToSchema DRepInfoResponse where
   declareNamedSchema proxy = do
@@ -512,6 +518,7 @@ data DRep = DRep
   , dRepUrl :: Maybe Text
   , dRepMetadataHash :: Maybe Text
   , dRepDeposit :: Integer
+  , dRepVotingPower :: Maybe Integer
   } deriving (Generic, Show)
 
 
@@ -522,7 +529,8 @@ exampleDrep =
    "{\"drepId\": \"d3a62ffe9c214e1a6a9809f7ab2a104c117f85e1f171f8f839d94be5\","
  <> "\"url\": \"https://proposal.metadata.xyz\","
  <> "\"metadataHash\": \"9af10e89979e51b8cdc827c963124a1ef4920d1253eef34a1d5cfe76438e3f11\","
- <> "\"deposit\": 0}"
+ <> "\"deposit\": 0,"
+ <> "\"votingPower\": 0}"
 
 instance ToSchema DRep where
     declareNamedSchema _ = pure $ NamedSchema (Just "DRep") $ mempty

govtool/backend/src/VVA/DRep.hs

@@ -60,7 +60,7 @@ listDReps ::
   m [DRepRegistration]
 listDReps = withPool $ \conn -> do
   results <- liftIO $ SQL.query_ conn listDRepsSql
-  return [DRepRegistration drepHash url dataHash (floor @Scientific deposit) | (drepHash, url, dataHash, deposit) <- results]
+  return [DRepRegistration drepHash url dataHash (floor @Scientific deposit) votingPower | (drepHash, url, dataHash, deposit, votingPower) <- results]
 
 getVotesSql :: SQL.Query
 getVotesSql = sqlFrom $(embedFile "sql/get-votes.sql")
@@ -99,12 +99,23 @@ getDRepInfo
 getDRepInfo drepId = withPool $ \conn -> do
   result <- liftIO $ SQL.query conn getDRepInfoSql (SQL.Only drepId)
   case result of
-    [(isRegisteredAsDRep, wasRegisteredAsDRep, isRegisteredAsSoleVoter, wasRegisteredAsSoleVoter, deposit)] ->
+    [ ( isRegisteredAsDRep
+      , wasRegisteredAsDRep
+      , isRegisteredAsSoleVoter
+      , wasRegisteredAsSoleVoter
+      , deposit
+      , url
+      , dataHash
+      , votingPower
+      )] ->
       return $ DRepInfo
         { dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
         , dRepInfoWasRegisteredAsDRep = fromMaybe False wasRegisteredAsDRep
         , dRepInfoIsRegisteredAsSoleVoter = fromMaybe False isRegisteredAsSoleVoter
         , dRepInfoWasRegisteredAsSoleVoter = fromMaybe False wasRegisteredAsSoleVoter
         , dRepInfoDeposit = deposit
+        , dRepInfoUrl = url
+        , dRepInfoDataHash = dataHash
+        , dRepInfoVotingPower = votingPower
         }
-    [] -> return $ DRepInfo False False False False Nothing
+    [] -> return $ DRepInfo False False False False Nothing Nothing Nothing Nothing

govtool/backend/src/VVA/Types.hs

@@ -64,13 +64,17 @@ data DRepInfo = DRepInfo
   , dRepInfoIsRegisteredAsSoleVoter :: Bool
   , dRepInfoWasRegisteredAsSoleVoter :: Bool
   , dRepInfoDeposit :: Maybe Integer
+  , dRepInfoUrl :: Maybe Text
+  , dRepInfoDataHash :: Maybe Text
+  , dRepInfoVotingPower :: Maybe Integer
   }
 
 data DRepRegistration = DRepRegistration
  { dRepRegistrationDrepHash :: Text
  , dRepRegistrationUrl :: Maybe Text
  , dRepRegistrationDataHash :: Maybe Text
  , dRepRegistrationDeposit :: Integer
+ , dRepRegistrationVotingPower :: Maybe Integer
  }
 
 data Proposal = Proposal

govtool/frontend/index.html

@@ -15,6 +15,7 @@
       html,
       body {
         margin: 0;
+        overscroll-behavior-y: none;
         padding: 0;
       }
     </style>

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

@@ -34,20 +34,21 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
     title,
   } = props;
   const { isMobile, screenWidth } = useScreenDimension();
-  const MOBILE_AND_WIDE_CONDITION = isMobile || screenWidth >= 1920;
 
   const {
     palette: { boxShadow2 },
   } = theme;
 
   return (
     <Box
-      p={4.25}
+      borderRadius={3}
       display="flex"
       flexDirection="column"
       flexGrow={1}
+      maxWidth={798}
+      p={4.25}
       sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
-      borderRadius={3}
+      width="-webkit-fill-available"
     >
       <Box display="flex" flexDirection="column" flex={1}>
         {imageURL ? (
@@ -56,16 +57,16 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
             width={imageWidth}
             height={imageHeight}
             style={{
-              alignSelf: MOBILE_AND_WIDE_CONDITION ? "center" : "start",
+              alignSelf: screenWidth < 640 ? "center" : "start",
             }}
           />
         ) : null}
         {title ? (
           <Typography
             fontWeight={isMobile ? 600 : 500}
             sx={{
-              mt: MOBILE_AND_WIDE_CONDITION ? 4 : 2.5,
-              textAlign: MOBILE_AND_WIDE_CONDITION ? "center" : "left",
+              mt: screenWidth < 640 ? 4 : 2.5,
+              textAlign: screenWidth < 640 ? "center" : "left",
             }}
             variant={isMobile ? "title2" : "headline5"}
           >
@@ -78,24 +79,21 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
             sx={{
               mb: 4.25,
               mt: 1.75,
-              textAlign: MOBILE_AND_WIDE_CONDITION ? "center" : "left",
+              textAlign: screenWidth < 640 ? "center" : "left",
             }}
             variant={isMobile ? "body2" : "body1"}
           >
             {description}
           </Typography>
         ) : null}
       </Box>
-      <Box
-        display="flex"
-        flexDirection={MOBILE_AND_WIDE_CONDITION ? "column" : "row"}
-      >
+      <Box display="flex" flexDirection={screenWidth < 640 ? "column" : "row"}>
         {firstButtonLabel ? (
           <Button
             data-testid={dataTestIdFirstButton}
             onClick={firstButtonAction}
             sx={{
-              width: MOBILE_AND_WIDE_CONDITION ? "100%" : "auto",
+              width: screenWidth < 640 ? "100%" : "auto",
             }}
           >
             {firstButtonLabel}
@@ -106,9 +104,9 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
           onClick={secondButtonAction}
           sx={{
             visibility: secondButtonLabel ? "visible" : "hidden",
-            ml: MOBILE_AND_WIDE_CONDITION ? 0 : 2,
-            mt: MOBILE_AND_WIDE_CONDITION ? 2 : 0,
-            width: MOBILE_AND_WIDE_CONDITION ? "100%" : "auto",
+            ml: screenWidth < 640 ? 0 : 2,
+            mt: screenWidth < 640 ? 2 : 0,
+            width: screenWidth < 640 ? "100%" : "auto",
             display: !secondButtonLabel && screenWidth < 768 ? "none" : "block",
           }}
           variant="outlined"

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

@@ -31,35 +31,15 @@ export const CenteredBoxPageWrapper: FC<PropsWithChildren<Props>> = ({
     <Background isReverted>
       <Box display={"flex"} minHeight={"100vh"} flexDirection="column">
         <DashboardTopNav
-          imageSRC={ICONS.appLogoIcon}
-          imageWidth={isMobile ? undefined : 42}
-          imageHeight={isMobile ? 24 : 35}
           title={pageTitle}
           isVotingPowerHidden={isVotingPowerHidden}
         />
         <Box
           display={"flex"}
           justifyContent={"center"}
           flexDirection={"column"}
-          mt={isMobile ? 0 : 7}
           height={isMobile ? "100%" : "auto"}
-          sx={{ marginTop: "97px" }}
         >
-          {isMobile && (
-            <Box borderBottom={1} borderColor={"#fff"}>
-              <Typography
-                variant="body2"
-                sx={{
-                  ml: 2,
-                  my: "26px",
-                  fontSize: "24px",
-                  fontWeight: 400,
-                }}
-              >
-                {pageTitle}
-              </Typography>
-            </Box>
-          )}
           <Link
             data-testid={"back-button"}
             sx={{

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

@@ -68,6 +68,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
       flex={1}
       flexDirection="column"
       p={3}
+      maxWidth={524}
       position="relative"
       sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
     >
@@ -192,15 +193,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
       ) : (
         <Box
           display="flex"
-          flexDirection={
-            screenWidth < 768
-              ? "column"
-              : screenWidth < 1024
-              ? "row"
-              : screenWidth < 1440
-              ? "column"
-              : "row"
-          }
+          flexDirection={screenWidth < 640 ? "column" : "row"}
         >
           {firstButtonLabel ? (
             <LoadingButton
@@ -211,14 +204,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
               size="large"
               variant={firstButtonVariant}
               sx={{
-                mr:
-                  screenWidth < 768
-                    ? 0
-                    : screenWidth < 1024 && secondButtonLabel
-                    ? 2
-                    : screenWidth >= 1440 && secondButtonLabel
-                    ? 2
-                    : 0,
+                mr: screenWidth < 640 ? 0 : 2,
                 width: isMobile ? "100%" : "auto",
               }}
             >
@@ -234,14 +220,7 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({
               variant={secondButtonVariant}
               sx={{
                 width: isMobile ? "100%" : "auto",
-                marginTop:
-                  screenWidth < 768
-                    ? 1
-                    : screenWidth < 1024
-                    ? 0
-                    : screenWidth < 1440
-                    ? 1
-                    : 0,
+                marginTop: screenWidth < 640 ? 1 : 0,
               }}
             >
               {secondButtonLabel}