Merge pull request #2198 from IntersectMBO/develop

GovTool v1.0.22-rc
IntersectMBO · Oct 23, 2024 · 960e4d9 · 960e4d9
2 parents d259c04 + 571e269
commit 960e4d9
Show file tree

Hide file tree

Showing 53 changed files with 1,077 additions and 980 deletions.
diff --git a/.github/workflows/add-issue-to-project.yml b/.github/workflows/add-issue-to-project.yml
@@ -0,0 +1,30 @@
+name: Add Issue to Projects
+
+on:
+  issues:
+    types: [opened]
+
+jobs:
+  add-to-projects:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Install GitHub CLI
+        run: sudo apt-get install gh
+
+      - name: Authenticate GitHub CLI with default token
+        run: gh auth login --with-token <<< "$GITHUB_TOKEN"
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add issue to GovTool Project
+        run: gh project item-add IntersectMBO/30 --content-type Issue --content-id ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Add issue to Community Backlog Project
+        run: gh project item-add IntersectMBO/34 --content-type Issue --content-id ${{ github.event.issue.node_id }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,11 +16,14 @@ changes.
 
 ### Fixed
 
--
+- Fix unwanted horizontal page scroll on Governance Actions page [Issue 1897](https://github.com/IntersectMBO/govtool/issues/1897)
+- Fix duplicate testIds for reference errors and hints in DRep metadata form [Issue 1965](https://github.com/IntersectMBO/govtool/issues/1965)
+- Eliminate duplicate DReps in the DRep Directory [Issue 2171](https://github.com/IntersectMBO/govtool/issues/2171)
+- Handle script based DReps [Issue 1951](https://github.com/IntersectMBO/govtool/issues/1951)
 
 ### Changed
 
--
+- Bump to use Cardano Node `10.0.0-pre`
 
 ### Removed
 

diff --git a/govtool/backend/sql/get-current-delegation.sql b/govtool/backend/sql/get-current-delegation.sql
@@ -4,6 +4,13 @@ select
     else encode(drep_hash.raw,'hex')
   end as drep_raw,
   drep_hash.view as drep_view,
+  EXISTS (
+    SELECT dh.has_script
+    FROM drep_hash as dh
+    WHERE drep_hash.raw = dh.raw
+    AND dh.has_script = true
+    LIMIT 1
+  ) AS has_script,
   encode(tx.hash, 'hex')
 from delegation_vote
 join tx on tx.id = delegation_vote.tx_id

diff --git a/govtool/backend/sql/get-drep-info.sql b/govtool/backend/sql/get-drep-info.sql
@@ -34,6 +34,18 @@ LatestRegistrationEntry AS (
         drep_registration.tx_id DESC
     LIMIT 1
 ),
+IsScriptHash AS (
+    SELECT EXISTS(
+        SELECT
+            drep_hash.has_script
+        FROM
+            drep_hash
+            CROSS JOIN DRepId
+        WHERE
+            drep_hash.raw = DRepId.raw
+        AND
+            drep_hash.has_script = true
+) AS has_script),
 IsRegisteredAsDRep AS (
     SELECT
         (LatestRegistrationEntry.deposit IS NULL
@@ -165,6 +177,7 @@ SoleVoterRetire AS (
     LIMIT 1
 )
 SELECT
+    IsScriptHash.has_script,
     IsRegisteredAsDRep.value,
     WasRegisteredAsDRep.value,
     IsRegisteredAsSoleVoter.value,
@@ -197,5 +210,6 @@ FROM
     CROSS JOIN SoleVoterRegister
     CROSS JOIN SoleVoterRetire
     CROSS JOIN LatestRegistrationEntry
+    CROSS JOIN IsScriptHash
     LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = LatestRegistrationEntry.voting_anchor_id
     LEFT JOIN off_chain_vote_drep_data ON off_chain_vote_drep_data.off_chain_vote_data_id = off_chain_vote_data.id
diff --git a/govtool/backend/sql/list-dreps.sql b/govtool/backend/sql/list-dreps.sql
@@ -21,6 +21,7 @@ DRepActivity AS (
 SELECT
   encode(dh.raw, 'hex'),
   dh.view,
+  dh.has_script,
   va.url,
   encode(va.data_hash, 'hex'),
   dr_deposit.deposit,
@@ -30,7 +31,7 @@ SELECT
   newestRegister.time AS last_register_time,
   COALESCE(latestDeposit.deposit, 0),
   non_deregister_voting_anchor.url IS NOT NULL AS has_non_deregister_voting_anchor,
-  off_chain_vote_fetch_error.fetch_error,
+  fetch_error.message,
   off_chain_vote_drep_data.payment_address,
   off_chain_vote_drep_data.given_name,
   off_chain_vote_drep_data.objectives,
@@ -96,8 +97,15 @@ FROM
   LEFT JOIN DRepDistr ON DRepDistr.hash_id = dh.id
     AND DRepDistr.rn = 1
   LEFT JOIN voting_anchor va ON va.id = dr_voting_anchor.voting_anchor_id
-  LEFT JOIN voting_anchor non_deregister_voting_anchor on non_deregister_voting_anchor.id = dr_non_deregister_voting_anchor.voting_anchor_id
-  LEFT JOIN off_chain_vote_fetch_error ON off_chain_vote_fetch_error.voting_anchor_id = va.id
+  LEFT JOIN voting_anchor non_deregister_voting_anchor ON non_deregister_voting_anchor.id = dr_non_deregister_voting_anchor.voting_anchor_id
+  LEFT JOIN (
+    SELECT fetch_error as message, voting_anchor_id
+    FROM off_chain_vote_fetch_error
+    WHERE fetch_time = (
+      SELECT max(fetch_time)
+      FROM off_chain_vote_fetch_error)
+    GROUP BY fetch_error, voting_anchor_id
+  ) AS fetch_error ON fetch_error.voting_anchor_id = va.id
   LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = va.id
   LEFT JOIN off_chain_vote_drep_data on off_chain_vote_drep_data.off_chain_vote_data_id = off_chain_vote_data.id 
   CROSS JOIN DRepActivity
@@ -130,6 +138,7 @@ GROUP BY
   dh.raw,
   second_to_newest_drep_registration.voting_anchor_id,
   dh.view,
+  dh.has_script,
   va.url,
   va.data_hash,
   dr_deposit.deposit,
@@ -140,7 +149,7 @@ GROUP BY
   newestRegister.time,
   latestDeposit.deposit,
   non_deregister_voting_anchor.url,
-  off_chain_vote_fetch_error.fetch_error,
+  fetch_error.message,
   off_chain_vote_drep_data.payment_address,
   off_chain_vote_drep_data.given_name,
   off_chain_vote_drep_data.objectives,

diff --git a/govtool/backend/sql/list-proposals.sql b/govtool/backend/sql/list-proposals.sql
@@ -54,7 +54,7 @@ SELECT
         end
     ) as description,
     CASE
-        WHEN meta.network_name::text = 'mainnet' THEN
+        WHEN meta.network_name::text = 'mainnet' OR meta.network_name::text = 'preprod' THEN
             latest_epoch.start_time + (gov_action_proposal.expiration - latest_epoch.no)::bigint * INTERVAL '5 days' 
         ELSE
             latest_epoch.start_time + (gov_action_proposal.expiration - latest_epoch.no)::bigint * INTERVAL '1 day' 

diff --git a/govtool/backend/src/VVA/API.hs b/govtool/backend/src/VVA/API.hs
@@ -106,7 +106,8 @@ mapDRepStatus Types.Inactive = Inactive
 drepRegistrationToDrep :: Types.DRepRegistration -> DRep
 drepRegistrationToDrep Types.DRepRegistration {..} =
   DRep
-    { dRepDrepId = DRepHash dRepRegistrationDRepHash,
+    { dRepIsScriptBased = dRepRegistrationIsScriptBased,
+      dRepDrepId = DRepHash dRepRegistrationDRepHash,
       dRepView = dRepRegistrationView,
       dRepUrl = dRepRegistrationUrl,
       dRepMetadataHash = dRepRegistrationDataHash,
@@ -131,6 +132,7 @@ delegationToResponse Types.Delegation {..} =
   DelegationResponse
     { delegationResponseDRepHash = HexText <$> delegationDRepHash,
       delegationResponseDRepView = delegationDRepView,
+      delegationResponseIsDRepScriptBased = delegationIsDRepScriptBased,
       delegationResponseTxHash = HexText delegationTxHash
     }
 
@@ -286,7 +288,8 @@ drepInfo (unHexText -> dRepId) = do
   CacheEnv {dRepInfoCache} <- asks vvaCache
   Types.DRepInfo {..} <- cacheRequest dRepInfoCache dRepId $ DRep.getDRepInfo dRepId
   return $ DRepInfoResponse
-    { dRepInfoResponseIsRegisteredAsDRep = dRepInfoIsRegisteredAsDRep
+    { dRepInfoResponseIsScriptBased = dRepInfoIsScriptBased
+    , dRepInfoResponseIsRegisteredAsDRep = dRepInfoIsRegisteredAsDRep
     , dRepInfoResponseWasRegisteredAsDRep = dRepInfoWasRegisteredAsDRep
     , dRepInfoResponseIsRegisteredAsSoleVoter = dRepInfoIsRegisteredAsSoleVoter
     , dRepInfoResponseWasRegisteredAsSoleVoter = dRepInfoWasRegisteredAsSoleVoter

diff --git a/govtool/backend/src/VVA/API/Types.hs b/govtool/backend/src/VVA/API/Types.hs
@@ -561,7 +561,8 @@ instance ToSchema VoteResponse where
 
 data DRepInfoResponse
   = DRepInfoResponse
-      { dRepInfoResponseIsRegisteredAsDRep       :: Bool
+      { dRepInfoResponseIsScriptBased            :: Bool
+      , dRepInfoResponseIsRegisteredAsDRep       :: Bool
       , dRepInfoResponseWasRegisteredAsDRep      :: Bool
       , dRepInfoResponseIsRegisteredAsSoleVoter  :: Bool
       , dRepInfoResponseWasRegisteredAsSoleVoter :: Bool
@@ -758,7 +759,8 @@ instance ToSchema DRepType where
 
 data DRep
   = DRep
-      { dRepDrepId                 :: DRepHash
+      { dRepIsScriptBased          :: Bool
+      , dRepDrepId                 :: DRepHash
       , dRepView                   :: Text
       , dRepUrl                    :: Maybe Text
       , dRepMetadataHash           :: Maybe Text
@@ -855,9 +857,10 @@ instance ToSchema ListDRepsResponse where
 
 data DelegationResponse
   = DelegationResponse
-      { delegationResponseDRepHash :: Maybe HexText
-      , delegationResponseDRepView :: Text
-      , delegationResponseTxHash   :: HexText
+      { delegationResponseDRepHash          :: Maybe HexText
+      , delegationResponseDRepView          :: Text
+      , delegationResponseIsDRepScriptBased :: Bool
+      , delegationResponseTxHash            :: HexText
       }
 deriveJSON (jsonOptions "delegationResponse") ''DelegationResponse
 

diff --git a/govtool/backend/src/VVA/AdaHolder.hs b/govtool/backend/src/VVA/AdaHolder.hs
@@ -42,9 +42,9 @@ getCurrentDelegation ::
 getCurrentDelegation stakeKey = withPool $ \conn -> do
   result <- liftIO $ SQL.query conn getCurrentDelegationSql (SQL.Only stakeKey)
   case result of
-    []                              -> return Nothing
-    [(mDRepHash, dRepView, txHash)] -> return $ Just $ Delegation mDRepHash dRepView txHash
-    _                               -> error ("multiple delegations for stake key: " <> unpack stakeKey)
+    []                                                 -> return Nothing
+    [(mDRepHash, dRepView, isDRepScriptBased, txHash)] -> return $ Just $ Delegation mDRepHash dRepView isDRepScriptBased txHash
+    _                                                  -> error ("multiple delegations for stake key: " <> unpack stakeKey)
 
 getVotingPowerSql :: SQL.Query
 getVotingPowerSql = sqlFrom $(embedFile "sql/get-stake-key-voting-power.sql")

diff --git a/govtool/backend/src/VVA/DRep.hs b/govtool/backend/src/VVA/DRep.hs
@@ -61,9 +61,10 @@ listDReps = withPool $ \conn -> do
   results <- liftIO $ SQL.query_ conn listDRepsSql
   timeZone <- liftIO getCurrentTimeZone
   return
-    [ DRepRegistration drepHash drepView url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date) metadataError paymentAddress givenName objectives motivations qualifications imageUrl imageHash
+    [ DRepRegistration drepHash drepView isScriptBased url dataHash (floor @Scientific deposit) votingPower status drepType txHash (localTimeToUTC timeZone date) metadataError paymentAddress givenName objectives motivations qualifications imageUrl imageHash
     | ( drepHash
         , drepView
+        , isScriptBased
         , url
         , dataHash
         , deposit
@@ -132,7 +133,8 @@ getDRepInfo
 getDRepInfo drepId = withPool $ \conn -> do
   result <- liftIO $ SQL.query conn getDRepInfoSql (SQL.Only drepId)
   case result of
-    [ ( isRegisteredAsDRep
+    [ ( isScriptBased
+      , isRegisteredAsDRep
       , wasRegisteredAsDRep
       , isRegisteredAsSoleVoter
       , wasRegisteredAsSoleVoter
@@ -153,7 +155,8 @@ getDRepInfo drepId = withPool $ \conn -> do
       , imageHash
       )] ->
       return $ DRepInfo
-        { dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
+        { dRepInfoIsScriptBased = isScriptBased
+        , dRepInfoIsRegisteredAsDRep = fromMaybe False isRegisteredAsDRep
         , dRepInfoWasRegisteredAsDRep = fromMaybe False wasRegisteredAsDRep
         , dRepInfoIsRegisteredAsSoleVoter = fromMaybe False isRegisteredAsSoleVoter
         , dRepInfoWasRegisteredAsSoleVoter = fromMaybe False wasRegisteredAsSoleVoter
@@ -173,4 +176,4 @@ getDRepInfo drepId = withPool $ \conn -> do
         , dRepInfoImageUrl = imageUrl
         , dRepInfoImageHash = imageHash
         }
-    [] -> return $ DRepInfo False False False False Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
+    [] -> return $ DRepInfo False False False False False Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing Nothing
diff --git a/govtool/backend/src/VVA/Types.hs b/govtool/backend/src/VVA/Types.hs
@@ -72,7 +72,8 @@ data Vote
 
 data DRepInfo
   = DRepInfo
-      { dRepInfoIsRegisteredAsDRep       :: Bool
+      { dRepInfoIsScriptBased            :: Bool
+      , dRepInfoIsRegisteredAsDRep       :: Bool
       , dRepInfoWasRegisteredAsDRep      :: Bool
       , dRepInfoIsRegisteredAsSoleVoter  :: Bool
       , dRepInfoWasRegisteredAsSoleVoter :: Bool
@@ -101,6 +102,7 @@ data DRepRegistration
   = DRepRegistration
       { dRepRegistrationDRepHash               :: Text
       , dRepRegistrationView                   :: Text
+      , dRepRegistrationIsScriptBased          :: Bool
       , dRepRegistrationUrl                    :: Maybe Text
       , dRepRegistrationDataHash               :: Maybe Text
       , dRepRegistrationDeposit                :: Integer
@@ -215,7 +217,8 @@ data NetworkMetrics
 
 data Delegation
   = Delegation
-      { delegationDRepHash :: Maybe Text
-      , delegationDRepView :: Text
-      , delegationTxHash   :: Text
+      { delegationDRepHash          :: Maybe Text
+      , delegationDRepView          :: Text
+      , delegationIsDRepScriptBased :: Bool
+      , delegationTxHash            :: Text
       }
diff --git a/govtool/frontend/src/components/atoms/FormErrorMessage.tsx b/govtool/frontend/src/components/atoms/FormErrorMessage.tsx
@@ -3,13 +3,16 @@ import { Typography } from "@mui/material";
 import { FormErrorMessageProps } from "./types";
 
 export const FormErrorMessage = ({
+  dataTestId,
   errorMessage,
   errorStyles,
 }: FormErrorMessageProps) =>
   errorMessage && (
     <Typography
       color="red"
-      data-testid={`${errorMessage.replace(/\s+/g, "-").toLowerCase()}-error`}
+      data-testid={
+        dataTestId ?? `${errorMessage.replace(/\s+/g, "-").toLowerCase()}-error`
+      }
       fontSize={12}
       fontWeight={400}
       sx={{ mt: 0.25 }}

diff --git a/govtool/frontend/src/components/atoms/FormHelpfulText.tsx b/govtool/frontend/src/components/atoms/FormHelpfulText.tsx
@@ -3,14 +3,17 @@ import { Typography } from "@mui/material";
 import { FormHelpfulTextProps } from "./types";
 
 export const FormHelpfulText = ({
+  dataTestId,
   helpfulText,
   helpfulTextStyle,
   sx,
 }: FormHelpfulTextProps) =>
   helpfulText && (
     <Typography
       color="#9792B5"
-      data-testid={`${helpfulText.replace(/\s+/g, "-").toLowerCase()}-error`}
+      data-testid={
+        dataTestId ?? `${helpfulText.replace(/\s+/g, "-").toLowerCase()}-error`
+      }
       fontSize={12}
       fontWeight={400}
       sx={{ mt: 0.5, ...sx }}

diff --git a/govtool/frontend/src/components/atoms/types.ts b/govtool/frontend/src/components/atoms/types.ts
@@ -57,11 +57,13 @@ export type CheckboxProps = Omit<MUICheckboxProps, "onChange" | "value"> & {
 };
 
 export type FormErrorMessageProps = {
+  dataTestId?: string;
   errorMessage?: string;
   errorStyles?: MUITypographyProps;
 };
 
 export type FormHelpfulTextProps = {
+  dataTestId?: string;
   helpfulText?: string;
   helpfulTextStyle?: MUITypographyProps;
   sx?: SxProps;

diff --git a/govtool/frontend/src/components/molecules/DRepDataForm.tsx b/govtool/frontend/src/components/molecules/DRepDataForm.tsx
@@ -233,6 +233,10 @@ const ReferencesSection = ({
             name={`${fieldName}.${index}.label`}
             helpfulText={t("forms.dRepData.referenceDescriptionHelpfulText")}
             dataTestId={`${type}-reference-description-${index + 1}-input`}
+            errorDataTestId={`${type}-reference-description-${index + 1}-error`}
+            helpfulTextDataTestId={`${type}-reference-description-${
+              index + 1
+            }-hint`}
             rules={Rules.LINK_DESCRIPTION}
           />
           <ControlledField.Input
@@ -252,6 +256,8 @@ const ReferencesSection = ({
             layoutStyles={{ mb: 3 }}
             name={`${fieldName}.${index}.uri`}
             dataTestId={`${type}-reference-url-${index + 1}-input`}
+            errorDataTestId={`${type}-reference-url-${index + 1}-error`}
+            helpfulTextDataTestId={`${type}-reference-url-${index + 1}-hint`}
             rules={Rules.LINK_URL}
           />
         </Fragment>