sancho-v1.0.10

.github/workflows/resync-cardano-node-and-db-sync.yml

@@ -13,10 +13,27 @@ on:
           - "test"
           - "staging"
           - "beta"
+      isProposalDiscussionForumEnabled:
+        description: "Enable proposal discussion forum"
+        required: true
+        type: choice
+        default: "disabled"
+        options:
+          - "enabled"
+          - "disabled"
+      forceRebuildDockerImages:
+        description: "Force rebuild the docker images"
+        required: false
+        type: choice
+        default: "false"
+        options:
+          - "true"
+          - "false"
 
 env:
   ENVIRONMENT: ${{ inputs.environment || 'dev' }}
   CARDANO_NETWORK: "sanchonet"
+  FORCE_REBUILD: ${{inputs.forceRebuildDockerImages == 'true'}}
 
 jobs:
   deploy:
@@ -27,22 +44,27 @@ jobs:
         working-directory: ./scripts/govtool
     env:
       DBSYNC_POSTGRES_DB: "cexplorer"
-      DBSYNC_POSTGRES_USER: "postgres"
       DBSYNC_POSTGRES_PASSWORD: "pSa8JCpQOACMUdGb"
+      DBSYNC_POSTGRES_USER: "postgres"
+      GA_CLIENT_EMAIL: ${{ secrets.GA_CLIENT_EMAIL }}
+      GA_PRIVATE_KEY: ${{ secrets.GA_PRIVATE_KEY }}
       GRAFANA_ADMIN_PASSWORD: ${{ secrets.GRAFANA_ADMIN_PASSWORD }}
-      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GRAFANA_SLACK_OAUTH_TOKEN: ${{ secrets.GRAFANA_SLACK_OAUTH_TOKEN }}
-      DEV_NGINX_BASIC_AUTH: ${{ secrets.DEV_NGINX_BASIC_AUTH }}
-      TEST_NGINX_BASIC_AUTH: ${{ secrets.TEST_NGINX_BASIC_AUTH }}
-      STAGING_NGINX_BASIC_AUTH: ${{ secrets.STAGING_NGINX_BASIC_AUTH }}
-      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
-      TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com"
+      GRAFANA_SLACK_RECIPIENT: ${{ secrets.GRAFANA_SLACK_RECIPIENT }}
       GTM_ID: ${{ secrets.GTM_ID }}
       NPMRC_TOKEN: ${{ secrets.NPMRC_TOKEN }}
-      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
-      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH1: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH1 }}
       IP_ADDRESS_BYPASSING_BASIC_AUTH2: ${{ secrets.IP_ADDRESS_BYPASSING_BASIC_AUTH2 }}
+      NEXT_PUBLIC_API_URL: "https://participation.sanchogov.tools"
+      NEXT_PUBLIC_GA4_PROPERTY_ID: ${{ secrets.NEXT_PUBLIC_GA4_PROPERTY_ID }}
+      DEV_NGINX_BASIC_AUTH: ${{ secrets.DEV_NGINX_BASIC_AUTH }}
+      PIPELINE_URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}
+      SENTRY_DSN: ${{ secrets.SENTRY_DSN_FRONTEND }}
+      SENTRY_DSN_BACKEND: ${{ secrets.SENTRY_DSN_BACKEND }}
+      SENTRY_IGNORE_API_RESOLUTION_ERROR: "1"
+      TRAEFIK_LE_EMAIL: "admin+govtool@binarapps.com"
+      USERSNAP_SPACE_API_KEY: ${{ secrets.USERSNAP_SPACE_API_KEY }}
+      IS_PROPOSAL_DISCUSSION_FORUM_ENABLED: ${{ inputs.isProposalDiscussionForumEnabled == 'enabled' }}
     steps:
       - name: Checkout code
         uses: actions/checkout@v3

CHANGELOG.md

@@ -10,21 +10,28 @@ changes.
 
 ## [Unreleased]
 
+### Added
+
+-
+
+### Fixed
+
+-
+
+### Changed
+
+-
+
+## [sancho-v1.0.9](https://github.com/IntersectMBO/govtool/releases/tag/sancho-v1.0.9) 2024-07-16
+
+### Added
+
 - Added 'sentryenv' field in backend config file [Issue 1401](https://github.com/IntersectMBO/govtool/issues/1401)
 - Add wallet connector package [Issue 898](https://github.com/IntersectMBO/govtool/issues/898)
-- Change DRep without metadata name from "Sole Voter" to "Direct Voter" [Issue 880](https://github.com/IntersectMBO/govtool/issues/880)
-- Inicialize Usersnap into App [Issue 546](https://github.com/IntersectMBO/govtool/issues/546)
+- Initialize Usersnap into App [Issue 546](https://github.com/IntersectMBO/govtool/issues/546)
 - Integrate frontend with metadata validation service [Issue 617](https://github.com/IntersectMBO/govtool/issues/617)
 - Implement a loading modal for the validation of the metadata [Issue 646](https://github.com/IntersectMBO/govtool/issues/646)
-- Fix displaying modals to not block signing transactions [Issue 710](https://github.com/IntersectMBO/govtool/issues/710)
-- Change style of url button to trim the file name [Issue 655](https://github.com/IntersectMBO/govtool/issues/655)
-- Change regex for parsing urls to match urls without protocol [Issue 655](https://github.com/IntersectMBO/govtool/issues/655)
 - Integrate ga displaying metadata validation with the validation service [Issue 712](https://github.com/IntersectMBO/govtool/issues/712)
-- Correct text of the governance action type [Issue 651](https://github.com/IntersectMBO/govtool/issues/651)
-- Enable coverage tests report
-
-### Added
-
 - added `bio` `dRepName` `email` `references` `metadataValid` and `metadataStatus` fields to `drep/list`
 - added `metadatavalidationmaxconcurrentrequests` field to the backend config
 - added `metadata/validate` endpoint [Issue 876](https://github.com/IntersectMBO/govtool/issues/876)
@@ -67,6 +74,7 @@ changes.
 - Replace govtool-wrapper governance action creation in favor of pdf-pillar [Issue 1284](https://github.com/IntersectMBO/govtool/issues/1284)
 - Add sentry environment config [Issue 1324](https://github.com/IntersectMBO/govtool/issues/1324)
 - Add proposal discussion pillar to home page [Issue 1431](https://github.com/IntersectMBO/govtool/issues/1431)
+- Enable coverage tests report
 
 ### Fixed
 
@@ -107,6 +115,9 @@ changes.
 - Fix app crash on voting on the GA without the connected wallet before [Issue 1313](https://github.com/IntersectMBO/govtool/issues/1313)
 - Fix the navigation to Home from Proposal pillar on disconnected wallet [Issue 1355](https://github.com/IntersectMBO/govtool/issues/1355)
 - Fix navigation over Proposal discussion forum pillar [Issue 1436](https://github.com/IntersectMBO/govtool/issues/1436)
+- Fix building the frontend image [Issue 1583](https://github.com/IntersectMBO/govtool/issues/1583)
+- Correct text of the governance action type [Issue 651](https://github.com/IntersectMBO/govtool/issues/651)
+- Fix displaying modals to not block signing transactions [Issue 710](https://github.com/IntersectMBO/govtool/issues/710)
 
 ### Changed
 
@@ -140,6 +151,9 @@ changes.
 - Changed copy on maintenance page [Issue 753](https://github.com/IntersectMBO/govtool/issues/753)
 - Update link to docs [Issue 1246](https://github.com/IntersectMBO/govtool/issues/1246)
 - Change label of Proposal Discussion nav item [Issue 1349](https://github.com/IntersectMBO/govtool/issues/1349)
+- Change DRep without metadata name from "Sole Voter" to "Direct Voter" [Issue 880](https://github.com/IntersectMBO/govtool/issues/880)
+- Change style of url button to trim the file name [Issue 655](https://github.com/IntersectMBO/govtool/issues/655)
+- Change regex for parsing urls to match urls without protocol [Issue 655](https://github.com/IntersectMBO/govtool/issues/655)
 
 ### Removed
 

govtool/backend/example-config.json

@@ -11,6 +11,7 @@
     "cachedurationseconds": 20,
     "sentrydsn": "https://username:password@senty.host/id",
     "sentryenv": "dev",
+    "metadatavalidationenabled": true,
     "metadatavalidationhost": "localhost",
     "metadatavalidationport": 3001,
     "metadatavalidationmaxconcurrentrequests": 10

govtool/backend/sql/list-proposals.sql

@@ -55,10 +55,10 @@ SELECT
     /* created date */
     voting_anchor.url,
     encode(voting_anchor.data_hash, 'hex'),
-    off_chain_vote_data.title,
-    off_chain_vote_data.abstract,
-    off_chain_vote_data.motivation,
-    off_chain_vote_data.rationale,
+    off_chain_vote_gov_action_data.title,
+    off_chain_vote_gov_action_data.abstract,
+    off_chain_vote_gov_action_data.motivation,
+    off_chain_vote_gov_action_data.rationale,
     off_chain_vote_data.json,
     off_chain_vote_data.json#>'{body, references}' as references,
     coalesce(Sum(ldd.amount) FILTER (WHERE voting_procedure.vote::text = 'Yes'), 0) +(
@@ -88,6 +88,7 @@ FROM
     JOIN block AS creator_block ON creator_block.id = creator_tx.block_id
     LEFT JOIN voting_anchor ON voting_anchor.id = gov_action_proposal.voting_anchor_id
     LEFT JOIN off_chain_vote_data ON off_chain_vote_data.voting_anchor_id = voting_anchor.id
+    LEFT JOIN off_chain_vote_gov_action_data ON off_chain_vote_gov_action_data.off_chain_vote_data_id = off_chain_vote_data.id
     LEFT JOIN voting_procedure ON voting_procedure.gov_action_proposal_id = gov_action_proposal.id
     LEFT JOIN LatestDrepDistr ldd ON ldd.hash_id = voting_procedure.drep_voter
         AND ldd.rn = 1
@@ -107,10 +108,10 @@ GROUP BY
         stake_address.view,
         treasury_withdrawal.amount,
         creator_block.epoch_no,
-        off_chain_vote_data.title,
-        off_chain_vote_data.abstract,
-        off_chain_vote_data.motivation,
-        off_chain_vote_data.rationale,
+        off_chain_vote_gov_action_data.title,
+        off_chain_vote_gov_action_data.abstract,
+        off_chain_vote_gov_action_data.motivation,
+        off_chain_vote_gov_action_data.rationale,
         off_chain_vote_data.json,
         gov_action_proposal.index,
         creator_tx.hash,

govtool/backend/src/VVA/API.hs

@@ -217,18 +217,30 @@ proposalToResponse Types.Proposal {..} Types.MetadataValidationResult{..} =
     proposalResponseCreatedEpochNo = proposalCreatedEpochNo,
     proposalResponseUrl = proposalUrl,
     proposalResponseMetadataHash = HexText proposalDocHash,
-    proposalResponseTitle = Types.proposalMetadataTitle <$> metadata,
-    proposalResponseAbstract = Types.proposalMetadataAbstract <$> metadata,
-    proposalResponseMotivation = Types.proposalMetadataMotivation <$> metadata,
-    proposalResponseRationale = Types.proposalMetadataRationale <$> metadata,
+    proposalResponseTitle = getTitle proposalTitle metadata,
+    proposalResponseAbstract = getAbstract proposalAbstract metadata,
+    proposalResponseMotivation = getMotivation proposalMotivation metadata,
+    proposalResponseRationale = getRationale proposalRationale metadata,
     proposalResponseMetadata = GovernanceActionMetadata <$> proposalMetadata,
-    proposalResponseReferences = maybe [] Types.proposalMetadataReferences metadata,
+    proposalResponseReferences = getReferences proposalReferences metadata,
     proposalResponseYesVotes = proposalYesVotes,
     proposalResponseNoVotes = proposalNoVotes,
     proposalResponseAbstainVotes = proposalAbstainVotes,
     proposalResponseMetadataStatus = metadataValidationResultStatus,
     proposalResponseMetadataValid = metadataValidationResultValid
   }
+  where
+   getTitle p Nothing = p
+   getTitle _ m = Types.proposalMetadataTitle <$> m
+   getAbstract p Nothing = p
+   getAbstract _ m = Types.proposalMetadataAbstract <$> m
+   getMotivation p Nothing = p
+   getMotivation _ m = Types.proposalMetadataMotivation <$> m
+   getRationale p Nothing = p
+   getRationale _ m = Types.proposalMetadataRationale <$> m
+   -- TODO: convert aeson references to [Text] from database
+   --getReferences p Nothing = p
+   getReferences _ m = maybe [] Types.proposalMetadataReferences m
 
 voteToResponse :: Types.Vote -> VoteParams
 voteToResponse Types.Vote {..} =
@@ -467,4 +479,4 @@ getDRepMetadataValidationResponse params = do
       return $ MetadataValidationResponse
         { metadataValidationResponseValid = metadataValidationResultValid
         , metadataValidationResponseStatus = metadataValidationResultStatus
-        }
+        }

govtool/backend/src/VVA/Config.hs

@@ -24,6 +24,7 @@ module VVA.Config
     , getServerHost
     , getServerPort
     , vvaConfigToText
+    , getMetadataValidationEnabled
     , getMetadataValidationHost
     , getMetadataValidationPort
     ) where
@@ -82,6 +83,8 @@ data VVAConfigInternal
       , vVAConfigInternalSentrydsn              :: String
         -- | Sentry environment
       , vVAConfigInternalSentryEnv              :: String
+        -- | Metadata validation service enabled
+      , vVAConfigInternalMetadataValidationEnabled :: Bool
         -- | Metadata validation service host
       , vVAConfigInternalMetadataValidationHost :: Text
         -- | Metadata validation service port
@@ -100,6 +103,7 @@ instance DefaultConfig VVAConfigInternal where
         vVaConfigInternalCacheDurationSeconds = 20,
         vVAConfigInternalSentrydsn = "https://username:password@senty.host/id",
         vVAConfigInternalSentryEnv = "development",
+        vVAConfigInternalMetadataValidationEnabled = True,
         vVAConfigInternalMetadataValidationHost = "localhost",
         vVAConfigInternalMetadataValidationPort = 3001,
         vVAConfigInternalMetadataValidationMaxConcurrentRequests = 10
@@ -120,6 +124,8 @@ data VVAConfig
       , sentryDSN              :: String
         -- | Sentry environment
       , sentryEnv              :: String
+        -- | Metadata validation service enabled
+      , metadataValidationEnabled :: Bool
         -- | Metadata validation service host
       , metadataValidationHost :: Text
         -- | Metadata validation service port
@@ -167,6 +173,7 @@ convertConfig VVAConfigInternal {..} =
       cacheDurationSeconds = vVaConfigInternalCacheDurationSeconds,
       sentryDSN = vVAConfigInternalSentrydsn,
       sentryEnv = vVAConfigInternalSentryEnv,
+      metadataValidationEnabled = vVAConfigInternalMetadataValidationEnabled,
       metadataValidationHost = vVAConfigInternalMetadataValidationHost,
       metadataValidationPort = vVAConfigInternalMetadataValidationPort,
       metadataValidationMaxConcurrentRequests = vVAConfigInternalMetadataValidationMaxConcurrentRequests
@@ -208,6 +215,12 @@ getServerHost ::
   m Text
 getServerHost = asks (serverHost . getter)
 
+-- | Access MetadataValidationService enabled
+getMetadataValidationEnabled ::
+  (Has VVAConfig r, MonadReader r m) =>
+  m Bool
+getMetadataValidationEnabled = asks (metadataValidationEnabled . getter)
+
 -- | Access MetadataValidationService host
 getMetadataValidationHost ::
   (Has VVAConfig r, MonadReader r m) =>

govtool/backend/src/VVA/Metadata.hs

@@ -38,22 +38,26 @@ validateMetadata
     -> Maybe Text
     -> m (Either Text Value)
 validateMetadata url hash standard = do
+    metadataEnabled <- getMetadataValidationEnabled
     metadataHost <- getMetadataValidationHost
     metadataPort <- getMetadataValidationPort
     manager <- asks getter
-    let requestBody = encode $ object (["url" .= unpack url, "hash" .= unpack hash] ++ maybe [] (\x -> ["standard" .= unpack x]) standard)
-    initialRequest <- liftIO $ parseRequest (unpack metadataHost <> ":" <> show metadataPort <> "/validate")
-    let request = initialRequest
-            { method = "POST"
-            , requestBody = RequestBodyLBS requestBody
-            , requestHeaders = [("Content-Type", "application/json")]
-            }
-    response <- liftIO $ try $ httpLbs request manager
-    case response of
-        Left (e :: HttpException) -> return $ Left (pack $ show e)
-        Right r -> case decode $ responseBody r of
-            Nothing -> throwError $ InternalError "Failed to validate metadata"
-            Just x -> return $ Right x
+    case metadataEnabled of
+      True -> do
+        let requestBody = encode $ object (["url" .= unpack url, "hash" .= unpack hash] ++ maybe [] (\x -> ["standard" .= unpack x]) standard)
+        initialRequest <- liftIO $ parseRequest (unpack metadataHost <> ":" <> show metadataPort <> "/validate")
+        let request = initialRequest
+                { method = "POST"
+                , requestBody = RequestBodyLBS requestBody
+                , requestHeaders = [("Content-Type", "application/json")]
+                }
+        response <- liftIO $ try $ httpLbs request manager
+        case response of
+            Left (e :: HttpException) -> return $ Left (pack $ show e)
+            Right r -> case decode $ responseBody r of
+                Nothing -> throwError $ InternalError "Failed to validate metadata"
+                Just x -> return $ Right x
+      False ->  return $ Right ""
 
 getProposalMetadataValidationResult ::
     (Has ConnectionPool r, Has Manager r, Has VVAConfig r, MonadReader r m, MonadIO m, MonadFail m, MonadError AppError m) =>
@@ -67,6 +71,7 @@ getProposalMetadataValidationResult url hash = do
             Right (Object r) -> case go r of
                 Nothing -> throwError $ InternalError "Failed to validate metadata"
                 Just x -> return x
+            Right "" -> return $ MetadataValidationResult True (Just "200") Nothing
     where
         go result = do
                 (Bool valid) <- lookup "valid" result
@@ -97,6 +102,7 @@ getDRepMetadataValidationResult url hash = do
             Right (Object r) -> case go r of
                 Nothing -> throwError $ InternalError "Failed to validate metadata"
                 Just x -> return x
+            Right "" -> return $ MetadataValidationResult True (Just "200") Nothing
     where
         go result = do
                 (Bool valid) <- lookup "valid" result
@@ -110,4 +116,4 @@ getDRepMetadataValidationResult url hash = do
                     let email = (\(String s) -> s) <$> lookup "email" m
                     let references = (\(Array references') -> map (\(String x) -> x) $ toList references') <$> lookup "references" m
                     DRepMetadata <$> bio <*> dRepName <*> email <*> references
-                return $ MetadataValidationResult valid status proposalMetadata
+                return $ MetadataValidationResult valid status proposalMetadata

govtool/backend/src/VVA/Types.hs

@@ -127,8 +127,8 @@ data Proposal
       , proposalUrl            :: Text
       , proposalDocHash        :: Text
       , proposalTitle          :: Maybe Text
-      , proposalAbout          :: Maybe Text
-      , proposalMotivaiton     :: Maybe Text
+      , proposalAbstract       :: Maybe Text
+      , proposalMotivation     :: Maybe Text
       , proposalRationale      :: Maybe Text
       , proposalMetadata       :: Maybe Value
       , proposalReferences     :: Maybe Value

govtool/frontend/Dockerfile

@@ -9,7 +9,7 @@ ARG NPMRC_TOKEN
 ARG VITE_USERSNAP_SPACE_API_KEY
 ARG VITE_IS_PROPOSAL_DISCUSSION_FORUM_ENABLED='false'
 
-ENV NODE_OPTIONS=--max_old_space_size=4096
+ENV NODE_OPTIONS=--max_old_space_size=8192
 WORKDIR /src
 
 # Set npm configuration settings using environment variables