IntersectMBO · smelc · Oct 10, 2023 · Oct 9, 2023 · Oct 9, 2023
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Poll.hs
@@ -4,7 +4,10 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.EraBased.Run.Governance.Poll
-  ( runGovernancePollCmds
+  ( runGovernancePollCmds,
+    runGovernanceCreatePoll,
+    runGovernanceAnswerPoll,
+    runGovernanceVerifyPoll
   ) where
 
 import           Cardano.Api

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs
@@ -35,6 +35,19 @@ data LegacyGovernanceCmds
       [VerificationKeyFile In]
       ProtocolParametersUpdate
       (Maybe FilePath)
+  | GovernanceCreatePoll
+      Text -- ^ Prompt
+      [Text] -- ^ Choices
+      (Maybe Word) -- ^ Nonce
+      (File GovernancePoll Out)
+  | GovernanceAnswerPoll
+      (File GovernancePoll In) -- ^ Poll file
+      (Maybe Word) -- ^ Answer index
+      (Maybe (File () Out)) -- ^ Tx file
+  | GovernanceVerifyPoll
+      (File GovernancePoll In) -- ^ Poll file
+      (File (Tx ()) In) -- ^ Tx file
+      (Maybe (File () Out)) -- ^ Tx file
   deriving Show
 
 renderLegacyGovernanceCmds :: LegacyGovernanceCmds -> Text
@@ -44,4 +57,7 @@ renderLegacyGovernanceCmds = \case
   GovernanceMIRTransfer _ _ _ TransferToTreasury -> "governance create-mir-certificate transfer-to-treasury"
   GovernanceMIRTransfer _ _ _ TransferToReserves -> "governance create-mir-certificate transfer-to-reserves"
   GovernanceUpdateProposal {} -> "governance create-update-proposal"
+  GovernanceCreatePoll{} -> "governance create-poll"
+  GovernanceAnswerPoll{} -> "governance answer-poll"
+  GovernanceVerifyPoll{} -> "governance verify-poll"
 
diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -1032,6 +1032,15 @@ pGovernanceCmds envCli =
     , subParser "create-update-proposal"
         $ Opt.info pUpdateProposal
         $ Opt.progDesc "Create an update proposal"
+    , subParser "create-poll"
+        $ Opt.info pGovernanceCreatePoll
+        $ Opt.progDesc "Create an SPO poll"
+    , subParser "answer-poll"
+        $ Opt.info pGovernanceAnswerPoll
+        $ Opt.progDesc "Answer an SPO poll"
+    , subParser "verify-poll"
+        $ Opt.info pGovernanceVerifyPoll
+        $ Opt.progDesc "Verify an answer to a given SPO poll"
     ]
   where
     mirCertParsers :: Parser LegacyGovernanceCmds
@@ -1090,6 +1099,28 @@ pGovernanceCmds envCli =
         <*> pProtocolParametersUpdate
         <*> optional pCostModels
 
+    pGovernanceCreatePoll :: Parser LegacyGovernanceCmds
+    pGovernanceCreatePoll =
+      GovernanceCreatePoll
+        <$> pPollQuestion
+        <*> some pPollAnswer
+        <*> optional pPollNonce
+        <*> pOutputFile
+
+    pGovernanceAnswerPoll :: Parser LegacyGovernanceCmds
+    pGovernanceAnswerPoll =
+      GovernanceAnswerPoll
+        <$> pPollFile
+        <*> optional pPollAnswerIndex
+        <*> optional pOutputFile
+
+    pGovernanceVerifyPoll :: Parser LegacyGovernanceCmds
+    pGovernanceVerifyPoll =
+      GovernanceVerifyPoll
+        <$> pPollFile
+        <*> pPollTxFile
+        <*> optional pOutputFile
+
 pGenesisCmds :: EnvCli -> Parser LegacyGenesisCmds
 pGenesisCmds envCli =
   asum

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs
@@ -24,6 +24,7 @@ import           Data.Aeson (eitherDecode)
 import qualified Data.ByteString.Lazy as LB
 import           Data.Function ((&))
 import qualified Data.Text as Text
+import Cardano.CLI.EraBased.Run.Governance.Poll
 
 runLegacyGovernanceCmds :: LegacyGovernanceCmds -> ExceptT GovernanceCmdError IO ()
 runLegacyGovernanceCmds = \case
@@ -35,6 +36,13 @@ runLegacyGovernanceCmds = \case
     runLegacyGovernanceGenesisKeyDelegationCertificate sbe genVk genDelegVk vrfVk out
   GovernanceUpdateProposal out eNo genVKeys ppUp mCostModelFp ->
     runLegacyGovernanceUpdateProposal out eNo genVKeys ppUp mCostModelFp
+  GovernanceCreatePoll prompt choices nonce out ->
+    runGovernanceCreatePoll BabbageEraOnwardsBabbage  prompt choices nonce out
+  GovernanceAnswerPoll poll ix mOutFile ->
+    runGovernanceAnswerPoll BabbageEraOnwardsBabbage poll ix mOutFile
+  GovernanceVerifyPoll poll metadata mOutFile ->
+    runGovernanceVerifyPoll BabbageEraOnwardsBabbage poll metadata mOutFile
+
 
 runLegacyGovernanceMIRCertificatePayStakeAddrs
   :: EraInEon ShelleyToBabbageEra

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -8722,6 +8722,9 @@ Usage: cardano-cli legacy governance
                                        ( create-mir-certificate
                                        | create-genesis-key-delegation-certificate
                                        | create-update-proposal
+                                       | create-poll
+                                       | answer-poll
+                                       | verify-poll
                                        )
 
   Governance commands
@@ -8848,6 +8851,25 @@ Usage: cardano-cli legacy governance create-update-proposal --out-file FILE
 
   Create an update proposal
 
+Usage: cardano-cli legacy governance create-poll --question STRING
+                                                   (--answer STRING)
+                                                   [--nonce UINT]
+                                                   --out-file FILE
+
+  Create an SPO poll
+
+Usage: cardano-cli legacy governance answer-poll --poll-file FILE
+                                                   [--answer INT]
+                                                   [--out-file FILE]
+
+  Answer an SPO poll
+
+Usage: cardano-cli legacy governance verify-poll --poll-file FILE
+                                                   --tx-file FILE
+                                                   [--out-file FILE]
+
+  Verify an answer to a given SPO poll
+
 Usage: cardano-cli legacy genesis 
                                     ( key-gen-genesis
                                     | key-gen-delegate
@@ -10012,6 +10034,9 @@ Usage: cardano-cli governance
                                 ( create-mir-certificate
                                 | create-genesis-key-delegation-certificate
                                 | create-update-proposal
+                                | create-poll
+                                | answer-poll
+                                | verify-poll
                                 )
 
   Governance commands
@@ -10138,6 +10163,25 @@ Usage: cardano-cli governance create-update-proposal --out-file FILE
 
   Create an update proposal
 
+Usage: cardano-cli governance create-poll --question STRING
+                                            (--answer STRING)
+                                            [--nonce UINT]
+                                            --out-file FILE
+
+  Create an SPO poll
+
+Usage: cardano-cli governance answer-poll --poll-file FILE
+                                            [--answer INT]
+                                            [--out-file FILE]
+
+  Answer an SPO poll
+
+Usage: cardano-cli governance verify-poll --poll-file FILE
+                                            --tx-file FILE
+                                            [--out-file FILE]
+
+  Verify an answer to a given SPO poll
+
 Usage: cardano-cli genesis 
                              ( key-gen-genesis
                              | key-gen-delegate

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance.cli
@@ -2,6 +2,9 @@ Usage: cardano-cli governance
                                 ( create-mir-certificate
                                 | create-genesis-key-delegation-certificate
                                 | create-update-proposal
+                                | create-poll
+                                | answer-poll
+                                | verify-poll
                                 )
 
   Governance commands
@@ -15,3 +18,6 @@ Available commands:
   create-genesis-key-delegation-certificate
                            Create a genesis key delegation certificate
   create-update-proposal   Create an update proposal
+  create-poll              Create an SPO poll
+  answer-poll              Answer an SPO poll
+  verify-poll              Verify an answer to a given SPO poll
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_answer-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_answer-poll.cli
@@ -0,0 +1,12 @@
+Usage: cardano-cli governance answer-poll --poll-file FILE
+                                            [--answer INT]
+                                            [--out-file FILE]
+
+  Answer an SPO poll
+
+Available options:
+  --poll-file FILE         Filepath to the ongoing poll.
+  --answer INT             The index of the chosen answer in the poll. Optional.
+                           Asked interactively if omitted.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_create-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_create-poll.cli
@@ -0,0 +1,14 @@
+Usage: cardano-cli governance create-poll --question STRING
+                                            (--answer STRING)
+                                            [--nonce UINT]
+                                            --out-file FILE
+
+  Create an SPO poll
+
+Available options:
+  --question STRING        The question for the poll.
+  --answer STRING          A possible choice for the poll. The option is
+                           repeatable.
+  --nonce UINT             An (optional) nonce for non-replayability.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_verify-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/governance_verify-poll.cli
@@ -0,0 +1,12 @@
+Usage: cardano-cli governance verify-poll --poll-file FILE
+                                            --tx-file FILE
+                                            [--out-file FILE]
+
+  Verify an answer to a given SPO poll
+
+Available options:
+  --poll-file FILE         Filepath to the ongoing poll.
+  --tx-file FILE           Filepath to the JSON TxBody or JSON Tx carrying a
+                           valid poll answer.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance.cli
@@ -2,6 +2,9 @@ Usage: cardano-cli legacy governance
                                        ( create-mir-certificate
                                        | create-genesis-key-delegation-certificate
                                        | create-update-proposal
+                                       | create-poll
+                                       | answer-poll
+                                       | verify-poll
                                        )
 
   Governance commands
@@ -15,3 +18,6 @@ Available commands:
   create-genesis-key-delegation-certificate
                            Create a genesis key delegation certificate
   create-update-proposal   Create an update proposal
+  create-poll              Create an SPO poll
+  answer-poll              Answer an SPO poll
+  verify-poll              Verify an answer to a given SPO poll
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_answer-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_answer-poll.cli
@@ -0,0 +1,12 @@
+Usage: cardano-cli legacy governance answer-poll --poll-file FILE
+                                                   [--answer INT]
+                                                   [--out-file FILE]
+
+  Answer an SPO poll
+
+Available options:
+  --poll-file FILE         Filepath to the ongoing poll.
+  --answer INT             The index of the chosen answer in the poll. Optional.
+                           Asked interactively if omitted.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_create-poll.cli
@@ -0,0 +1,14 @@
+Usage: cardano-cli legacy governance create-poll --question STRING
+                                                   (--answer STRING)
+                                                   [--nonce UINT]
+                                                   --out-file FILE
+
+  Create an SPO poll
+
+Available options:
+  --question STRING        The question for the poll.
+  --answer STRING          A possible choice for the poll. The option is
+                           repeatable.
+  --nonce UINT             An (optional) nonce for non-replayability.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_verify-poll.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_governance_verify-poll.cli
@@ -0,0 +1,12 @@
+Usage: cardano-cli legacy governance verify-poll --poll-file FILE
+                                                   --tx-file FILE
+                                                   [--out-file FILE]
+
+  Verify an answer to a given SPO poll
+
+Available options:
+  --poll-file FILE         Filepath to the ongoing poll.
+  --tx-file FILE           Filepath to the JSON TxBody or JSON Tx carrying a
+                           valid poll answer.
+  --out-file FILE          The output file.
+  -h,--help                Show this help text