Merge pull request #3991 from IntersectMBO/develop

v2.0.33

Author: bosko-m

.github/workflows/code_check_backend.yml

@@ -13,8 +13,9 @@ jobs:
       - name: Use Haskell
         uses: haskell-actions/setup@v2
         with:
-          ghc-version: '9.2.7'
-          cabal-version: '3.6.0.0'
+          ghc-version: '9.2.8'
+          cabal-version: '3.8.1.0'
+          cabal-update: false
 
       - name: Use Python
         uses: actions/setup-python@v2
@@ -26,6 +27,13 @@ jobs:
 
       - name: Install HLint
         run: |
+          rm -rf ~/.cabal ~/.ghcup
+          mkdir -p ~/.cabal
+          cat <<EOF > ~/.cabal/config
+          repository hackage.haskell.org
+            url: http://hackage.haskell.org/
+            secure: False
+          EOF
           cabal update
           cabal install hlint
 
@@ -41,8 +49,9 @@ jobs:
       - name: Use Haskell
         uses: haskell-actions/setup@v2
         with:
-          ghc-version: '9.2.7'
-          cabal-version: '3.6.0.0'
+          ghc-version: '9.2.8'
+          cabal-version: '3.8.1.0'
+          cabal-update: false
 
       - name: Use Python
         uses: actions/setup-python@v2
@@ -54,6 +63,13 @@ jobs:
 
       - name: Install HLint
         run: |
+          rm -rf ~/.cabal ~/.ghcup
+          mkdir -p ~/.cabal
+          cat <<EOF > ~/.cabal/config
+          repository hackage.haskell.org
+            url: http://hackage.haskell.org/
+            secure: False
+          EOF
           cabal update
           cabal install stylish-haskell
 

.github/workflows/merge.yaml

@@ -12,11 +12,11 @@ permissions:
   packages: write
 
 env:
-  ENVIRONMENT: ${{ (github.ref_name == 'main' && 'prod-govtool') || (github.ref_name == 'staging' && 'pre-prod-govtool') || (github.ref_name == 'test' && 'qa-govtool') || (github.ref_name == 'develop' && 'dev-govtool') }}
+  ENVIRONMENT: ${{ (github.ref_name == 'develop' && 'dev-govtool') }}
 
 jobs:
   check-build-deploy:
-    environment: ${{ (github.ref_name == 'main' && 'prod-govtool') || (github.ref_name == 'staging' && 'pre-prod-govtool') || (github.ref_name == 'test' && 'qa-govtool') || (github.ref_name == 'develop' && 'dev-govtool') }}
+    environment: ${{ (github.ref_name == 'develop' && 'dev-govtool') }}
     strategy:
       fail-fast: false
       matrix:

CHANGELOG.md

@@ -15,6 +15,7 @@ changes.
 ### Fixed
 
 - Fix disappearing proposals in the governance actions list for the same tx hashes [Issue 3918](https://github.com/IntersectMBO/govtool/issues/3918)
+- Fix incorrect display of new committee parameters in Governance Action details [Issue 3954](https://github.com/IntersectMBO/govtool/issues/3954)
 
 ### Changed
 

govtool/backend/app/Main.hs

@@ -16,6 +16,7 @@ import           Control.Monad.Trans.Except
 import           Control.Monad.Trans.Reader
 
 import           Data.Aeson                             hiding (Error)
+import           Data.Aeson                             (encode)
 import qualified Data.ByteString                        as BS
 import           Data.ByteString.Char8                  (unpack)
 import qualified Data.Cache                             as Cache
@@ -35,7 +36,7 @@ import           Data.Text.Encoding                     (encodeUtf8)
 import qualified Data.Text.IO                           as Text
 import qualified Data.Text.Lazy                         as LazyText
 import qualified Data.Text.Lazy.Encoding                as LazyText
-
+import qualified Data.ByteString.Lazy.Char8             as BS8
 import           Database.PostgreSQL.Simple             (close, connectPostgreSQL, Connection)
 
 import           Network.Wai
@@ -62,8 +63,10 @@ import           VVA.API.Types
 import           VVA.CommandLine
 import           VVA.Config
 import           VVA.Types                              (AppEnv (..),
-                                                         AppError (CriticalError, InternalError, NotFoundError, ValidationError),
+                                                         AppError (..),
                                                          CacheEnv (..))
+import           VVA.Ipfs                              (IpfsError(..))
+
 
 -- Function to create a connection pool with optimized settings
 createOptimizedConnectionPool :: BS.ByteString -> IO (Pool Connection)
@@ -288,10 +291,15 @@ liftServer appEnv =
   where
     handleErrors :: Either AppError a -> Handler a
     handleErrors (Right x) = pure x
-    handleErrors (Left (ValidationError msg)) = throwError $ err400 { errBody = BS.fromStrict $ encodeUtf8 msg }
-    handleErrors (Left (NotFoundError msg)) = throwError $ err404 { errBody = BS.fromStrict $ encodeUtf8 msg }
-    handleErrors (Left (CriticalError msg)) = throwError $ err500 { errBody = BS.fromStrict $ encodeUtf8 msg }
-    handleErrors (Left (InternalError msg)) = throwError $ err500 { errBody = BS.fromStrict $ encodeUtf8 msg }
+    handleErrors (Left appError) = do
+      let status = case appError of
+            ValidationError _ -> err400
+            NotFoundError _   -> err404
+            CriticalError _   -> err500
+            InternalError _   -> err500
+            AppIpfsError (OtherIpfsError _)    -> err400
+            AppIpfsError _    -> err503
+      throwError $ status { errBody = encode appError, errHeaders = [("Content-Type", "application/json")] }
 -- * Swagger
 
 type SwaggerAPI = SwaggerSchemaUI "swagger-ui" "swagger.json"

govtool/backend/example-config.json

@@ -6,6 +6,7 @@
       "password" : "postgres",
       "port"     : 5432
     },
+  "pinataapijwt": "",
   "port" : 9999,
   "host" : "localhost",
   "cachedurationseconds": 20,

govtool/backend/sql/list-proposals.sql

@@ -42,6 +42,21 @@ CommitteeData AS (
     FROM
         committee_member cm
     JOIN committee_hash ch ON cm.committee_hash_id = ch.id
+    WHERE EXISTS (
+        SELECT 1
+        FROM committee_registration cr
+        WHERE cr.cold_key_id = ch.id
+    )
+    AND NOT EXISTS (
+        SELECT 1
+        FROM committee_de_registration cdr
+        WHERE cdr.cold_key_id = ch.id
+        AND cdr.tx_id > (
+            SELECT MAX(cr2.tx_id)
+            FROM committee_registration cr2
+            WHERE cr2.cold_key_id = ch.id
+        )
+    )
     ORDER BY
         ch.raw, cm.expiration_epoch DESC
 ),
@@ -61,10 +76,31 @@ ParsedDescription AS (
 MembersToBeRemoved AS (
     SELECT
         id,
-        json_agg(VALUE->>'keyHash') AS members_to_be_removed
+        json_agg(
+            json_build_object(
+                'hash', COALESCE(
+                    VALUE->>'keyHash',
+                    VALUE->>'scriptHash'
+                ),
+                'type', CASE
+                    WHEN VALUE->>'keyHash' IS NOT NULL THEN 'keyHash'
+                    WHEN VALUE->>'scriptHash' IS NOT NULL THEN 'scriptHash'
+                    ELSE 'unknown'
+                END,
+                'hasScript', CASE
+                    WHEN VALUE->>'scriptHash' IS NOT NULL THEN true
+                    ELSE false
+                END
+            )
+        ) AS members_to_be_removed
     FROM
         ParsedDescription pd,
-        json_array_elements(members_to_be_removed::json) AS value
+        json_array_elements(
+            CASE
+                WHEN pd.members_to_be_removed IS NULL THEN '[]'::json
+                ELSE pd.members_to_be_removed::json
+            END
+        ) AS value
     GROUP BY
         id
 ),
@@ -73,7 +109,15 @@ ProcessedCurrentMembers AS (
         pd.id,
         json_agg(
             json_build_object(
-                'hash', regexp_replace(kv.key, '^keyHash-', ''),
+                'hash', COALESCE(
+                    regexp_replace(kv.key, '^keyHash-', ''),
+                    regexp_replace(kv.key, '^scriptHash-', '')
+                ),
+                'type', CASE
+                    WHEN kv.key LIKE 'keyHash-%' THEN 'keyHash'
+                    WHEN kv.key LIKE 'scriptHash-%' THEN 'scriptHash'
+                    ELSE 'unknown'
+                END,
                 'newExpirationEpoch', kv.value::int
             )
         ) AS current_members
@@ -88,9 +132,17 @@ EnrichedCurrentMembers AS (
         pcm.id,
         json_agg(
             json_build_object(
-                'hash', cm.hash,
+                'hash', CASE
+                    WHEN (member->>'hash') LIKE 'scriptHash-%' THEN
+                        regexp_replace(member->>'hash', '^scriptHash-', '')
+                    WHEN (member->>'hash') LIKE 'keyHash-%' THEN
+                        regexp_replace(member->>'hash', '^keyHash-', '')
+                    ELSE
+                        member->>'hash'
+                END,
+                'type', member->>'type',
                 'expirationEpoch', cm.expiration_epoch,
-                'hasScript', cm.has_script,
+                'hasScript', COALESCE(cm.has_script, member->>'type' = 'scriptHash'),
                 'newExpirationEpoch', (member->>'newExpirationEpoch')::int
             )
         ) AS enriched_members
@@ -247,9 +299,9 @@ SELECT
                     )
                 FROM
                     ParsedDescription pd
-                JOIN
+                LEFT JOIN
                     MembersToBeRemoved mtr ON pd.id = mtr.id
-                JOIN
+                LEFT JOIN
                     EnrichedCurrentMembers em ON pd.id = em.id
                 WHERE
                     pd.id = gov_action_proposal.id