Transaction view: show proposals and votes

IntersectMBO · May 23, 2024 · a2873b3 · a2873b3
1 parent d363518
commit a2873b3
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 2 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -241,6 +241,7 @@ library
                       , transformers-except ^>= 0.1.3
                       , unliftio-core
                       , utf8-string
+                      , vector
                       , yaml
 
 executable cardano-cli

diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
@@ -2,6 +2,7 @@
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE NamedFieldPuns #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TypeOperators #-}
 
 -- | User-friendly pretty-printing for textual user interfaces (TUI)
@@ -36,7 +37,7 @@ import           Cardano.Api.Shelley (Address (ShelleyAddress), Hash (..),
                    fromShelleyStakeReference, toShelleyStakeCredential)
 
 import           Cardano.CLI.Types.MonadWarning (MonadWarning, eitherToWarning, runWarningIO)
-import           Cardano.Prelude (first)
+import           Cardano.Prelude (Foldable (..), first)
 
 import           Codec.CBOR.Encoding (Encoding)
 import           Codec.CBOR.FlatTerm (fromFlatTerm, toFlatTerm)
@@ -56,12 +57,16 @@ import qualified Data.Map.Strict as Map
 import           Data.Maybe (catMaybes, isJust, maybeToList)
 import           Data.Ratio (numerator)
 import qualified Data.Text as Text
+import qualified Data.Vector as Vector
 import           Data.Yaml (array)
 import           Data.Yaml.Pretty (setConfCompare)
 import qualified Data.Yaml.Pretty as Yaml
 import           GHC.Real (denominator)
 import           GHC.Unicode (isAlphaNum)
 
+{- HLINT ignore "Redundant bracket" -}
+{- HLINT ignore "Move brackets to avoid $" -}
+
 data FriendlyFormat = FriendlyJson | FriendlyYaml
 
 friendly ::
@@ -175,6 +180,8 @@ friendlyTxBodyImpl
       , txTotalCollateral
       , txReturnCollateral
       , txInsReference
+      , txProposalProcedures
+      , txVotingProcedures
       , txUpdateProposal
       , txValidityLowerBound
       , txValidityUpperBound
@@ -200,7 +207,43 @@ friendlyTxBodyImpl
                   , "update proposal" .= friendlyUpdateProposal txUpdateProposal
                   , "validity range" .= friendlyValidityRange era (txValidityLowerBound, txValidityUpperBound)
                   , "withdrawals" .= friendlyWithdrawals txWithdrawals
-                  ])
+                  ]) ++
+                (inEonForEra
+                  []
+                  (\(cOnwards :: ConwayEraOnwards era) ->
+                      case txProposalProcedures of
+                       Nothing -> []
+                       Just (Featured _ TxProposalProceduresNone) -> []
+                       Just (Featured _ (TxProposalProcedures lProposals _witnesses)) ->
+                         ["governance actions" .= (friendlyLedgerProposals cOnwards $ toList lProposals)])
+                      era)
+                    ++
+                (inEonForEra
+                  []
+                  (\cOnwards ->
+                    case txVotingProcedures of
+                       Nothing -> []
+                       Just (Featured _ TxVotingProceduresNone) -> []
+                       Just (Featured _ (TxVotingProcedures votes _witnesses)) ->
+                             ["votes" .= (friendlyVotingProcedures cOnwards votes)])
+                  era)
+  where
+    friendlyLedgerProposals :: ConwayEraOnwards era -> [L.ProposalProcedure (ShelleyLedgerEra era)] -> Aeson.Value
+    friendlyLedgerProposals cOnwards proposalProcedures =
+      Array $ Vector.fromList $ map (friendlyLedgerProposal cOnwards) proposalProcedures
+
+friendlyLedgerProposal :: ConwayEraOnwards era -> L.ProposalProcedure (ShelleyLedgerEra era) -> Aeson.Value
+friendlyLedgerProposal cOnwards proposalProcedure = object $ friendlyProposalImpl cOnwards (Proposal proposalProcedure)
+
+friendlyVotingProcedures :: ConwayEraOnwards era -> L.VotingProcedures (ShelleyLedgerEra era) -> Aeson.Value
+friendlyVotingProcedures cOnwards x = conwayEraOnwardsConstraints cOnwards $ toJSON x -- (L.VotingProcedures { L.unVotingProcedures = votesMap }) =
+  -- conwayEraOnwardsConstraints cOnwards $ array $ [
+  --   object $ [
+  --       "voter" .= toJSON voter
+  --     , "votes" .= undefined
+  --   ]
+  --   | (voter, votes) <- Map.toList votesMap
+  -- ]
 
 redeemerIfShelleyBased :: MonadWarning m => CardanoEra era -> TxBody era -> m [Aeson.Pair]
 redeemerIfShelleyBased era tb =