Add --verification-key option to committee key-hash command

cardano-cli/cardano-cli.cabal

@@ -123,6 +123,7 @@ library
                         Cardano.CLI.Types.Common
                         Cardano.CLI.Types.Governance
                         Cardano.CLI.Types.Key
+                        Cardano.CLI.Types.Key.VerificationKey
                         Cardano.CLI.Types.Output
 
   other-modules:        Paths_cardano_cli

cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Committee.hs

@@ -9,6 +9,7 @@ module Cardano.CLI.EraBased.Commands.Governance.Committee
 import           Cardano.Api
 
 import           Cardano.CLI.Types.Key
+import           Cardano.CLI.Types.Key.VerificationKey
 
 import           Data.Text (Text)
 
@@ -23,7 +24,7 @@ data GovernanceCommitteeCmds era
       (File (SigningKey ()) Out)
   | GovernanceCommitteeKeyHash -- TODO to be moved under the top-level command group "key"
       (ConwayEraOnwards era)
-      (File (VerificationKey ()) In)
+      AnyVerificationKeySource
   | GovernanceCommitteeCreateHotKeyAuthorizationCertificate -- TODO to be moved under the top-level command group "key"
       (ConwayEraOnwards era)
       (VerificationKeyOrHashOrFile CommitteeColdKey)

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -20,6 +20,7 @@ import           Cardano.CLI.Parser
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Governance
 import           Cardano.CLI.Types.Key
+import           Cardano.CLI.Types.Key.VerificationKey
 import qualified Cardano.Ledger.Shelley.TxBody as Shelley
 
 import           Control.Monad (mfilter)
@@ -696,6 +697,30 @@ pVerificationKeyFileIn =
     , Opt.completer (Opt.bashCompleter "file")
     ]
 
+pAnyVerificationKeyFileIn :: String -> Parser (VerificationKeyFile In)
+pAnyVerificationKeyFileIn helpText =
+  fmap File $ Opt.strOption $ mconcat
+    [ Opt.long "verification-key-file"
+    , Opt.metavar "FILE"
+    , Opt.help $ "Input filepath of the " <> helpText <> "."
+    , Opt.completer (Opt.bashCompleter "file")
+    ]
+
+pAnyVerificationKeyText :: String -> Parser AnyVerificationKeyText
+pAnyVerificationKeyText helpText =
+  fmap (AnyVerificationKeyText . Text.pack) $ Opt.strOption $ mconcat
+    [ Opt.long "verification-key"
+    , Opt.metavar "STRING"
+    , Opt.help $ helpText <> " (Bech32-encoded)"
+    ]
+
+pAnyVerificationKeySource :: String -> Parser AnyVerificationKeySource
+pAnyVerificationKeySource helpText =
+  asum
+    [ AnyVerificationKeySourceOfText <$> pAnyVerificationKeyText helpText
+    , AnyVerificationKeySourceOfFile <$> pAnyVerificationKeyFileIn helpText
+    ]
+
 pCommitteeHotKey :: Parser (VerificationKey CommitteeHotKey)
 pCommitteeHotKey =
   Opt.option (Opt.eitherReader deserialiseFromHex) $ mconcat

cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs

@@ -78,18 +78,14 @@ pGovernanceCommitteeKeyHash era = do
   w <- maybeFeatureInEra era
   pure
     $ subParser "key-hash"
-    $ Opt.info (pCmd w)
+    $ Opt.info
+        ( GovernanceCommitteeKeyHash w
+            <$> pAnyVerificationKeySource "Constitutional Committee Member key (hot or cold)"
+        )
     $ Opt.progDesc
     $ mconcat
         [ "Print the identifier (hash) of a public key"
         ]
-  where
-    pCmd :: ()
-      => ConwayEraOnwards era
-      -> Parser (GovernanceCommitteeCmds era)
-    pCmd w =
-      GovernanceCommitteeKeyHash w
-        <$> pVerificationKeyFileIn
 
 pGovernanceCommitteeCreateHotKeyAuthorizationCertificate :: ()
   => CardanoEra era

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs

@@ -11,6 +11,7 @@ import           Cardano.Api.Shelley
 
 import           Cardano.CLI.EraBased.Commands.Governance.Committee
 import           Cardano.CLI.Types.Key
+import           Cardano.CLI.Types.Key.VerificationKey
 
 import           Control.Monad.Except (ExceptT)
 import           Control.Monad.IO.Class (liftIO)
@@ -21,14 +22,17 @@ import qualified Data.ByteString.Char8 as BS
 import           Data.Function
 
 data GovernanceCommitteeError
-  = GovernanceCommitteeCmdKeyReadError (FileError InputDecodeError)
+  = GovernanceCommitteeCmdKeyDecodeError InputDecodeError
+  | GovernanceCommitteeCmdKeyReadError (FileError InputDecodeError)
   | GovernanceCommitteeCmdTextEnvReadFileError (FileError TextEnvelopeError)
   | GovernanceCommitteeCmdTextEnvWriteError (FileError ())
   | GovernanceCommitteeCmdWriteFileError (FileError ())
   deriving Show
 
 instance Error GovernanceCommitteeError where
   displayError = \case
+    GovernanceCommitteeCmdKeyDecodeError e ->
+      "Cannot decode key: " <> displayError e
     GovernanceCommitteeCmdKeyReadError e ->
       "Cannot read key: " <> displayError e
     GovernanceCommitteeCmdWriteFileError e ->
@@ -109,16 +113,25 @@ data SomeCommitteeKey f
 
 runGovernanceCommitteeKeyHash :: ()
   => ConwayEraOnwards era
-  -> File (VerificationKey ()) In
+  -> AnyVerificationKeySource
   -> ExceptT GovernanceCommitteeError IO ()
-runGovernanceCommitteeKeyHash _w vkeyPath = do
+runGovernanceCommitteeKeyHash _w vkeySource = do
   vkey <-
-    readFileTextEnvelopeAnyOf
-      [ FromSomeType (AsVerificationKey AsCommitteeHotKey ) ACommitteeHotKey
-      , FromSomeType (AsVerificationKey AsCommitteeColdKey) ACommitteeColdKey
-      ]
-      vkeyPath
-    & firstExceptT GovernanceCommitteeCmdTextEnvReadFileError . newExceptT
+    case vkeySource of
+      AnyVerificationKeySourceOfText vkText -> do
+        let asTypes =
+              [ FromSomeType (AsVerificationKey AsCommitteeHotKey ) ACommitteeHotKey
+              , FromSomeType (AsVerificationKey AsCommitteeColdKey) ACommitteeColdKey
+              ]
+        pure (deserialiseAnyOfFromBech32 asTypes (unAnyVerificationKeyText vkText))
+          & onLeft (left . GovernanceCommitteeCmdKeyDecodeError . InputBech32DecodeError)
+      AnyVerificationKeySourceOfFile vkeyPath -> do
+        let asTypes =
+              [ FromSomeType (AsVerificationKey AsCommitteeHotKey ) ACommitteeHotKey
+              , FromSomeType (AsVerificationKey AsCommitteeColdKey) ACommitteeColdKey
+              ]
+        readFileTextEnvelopeAnyOf asTypes vkeyPath
+          & firstExceptT GovernanceCommitteeCmdTextEnvReadFileError . newExceptT
 
   liftIO $ BS.putStrLn (renderKeyHash vkey)
 

cardano-cli/src/Cardano/CLI/Types/Key/VerificationKey.hs

@@ -0,0 +1,23 @@
+{-# LANGUAGE DataKinds #-}
+
+module Cardano.CLI.Types.Key.VerificationKey
+  ( AnyVerificationKeySource(..)
+  , AnyVerificationKeyText(..)
+  ) where
+
+import           Cardano.Api
+
+import           Data.Text (Text)
+
+-- | A bech32 text encoded verification key of an unspecified key role.
+newtype AnyVerificationKeyText = AnyVerificationKeyText
+  { unAnyVerificationKeyText :: Text
+  }
+  deriving (Eq, Show)
+
+-- | The source from which a verification key of an unspecified key role can be
+-- derived.
+data AnyVerificationKeySource
+  = AnyVerificationKeySourceOfText !AnyVerificationKeyText
+  | AnyVerificationKeySourceOfFile !(File (VerificationKey ()) In)
+  deriving (Eq, Show)

cardano-cli/test/cardano-cli-golden/files/golden/help.cli

@@ -794,7 +794,10 @@ Usage: cardano-cli conway governance committee key-gen-hot --verification-key-fi
 
   Create a cold key pair for a Constitutional Committee Member
 
-Usage: cardano-cli conway governance committee key-hash --verification-key-file FILE
+Usage: cardano-cli conway governance committee key-hash 
+                                                          ( --verification-key STRING
+                                                          | --verification-key-file FILE
+                                                          )
 
   Print the identifier (hash) of a public key
 
@@ -1200,7 +1203,10 @@ Usage: cardano-cli experimental governance committee key-gen-hot --verification-
 
   Create a cold key pair for a Constitutional Committee Member
 
-Usage: cardano-cli experimental governance committee key-hash --verification-key-file FILE
+Usage: cardano-cli experimental governance committee key-hash 
+                                                                ( --verification-key STRING
+                                                                | --verification-key-file FILE
+                                                                )
 
   Print the identifier (hash) of a public key
 

cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_committee_key-hash.cli

@@ -1,8 +1,15 @@
-Usage: cardano-cli conway governance committee key-hash --verification-key-file FILE
+Usage: cardano-cli conway governance committee key-hash 
+                                                          ( --verification-key STRING
+                                                          | --verification-key-file FILE
+                                                          )
 
   Print the identifier (hash) of a public key
 
 Available options:
+  --verification-key STRING
+                           Constitutional Committee Member key (hot or cold)
+                           (Bech32-encoded)
   --verification-key-file FILE
-                           Input filepath of the verification key.
+                           Input filepath of the Constitutional Committee Member
+                           key (hot or cold).
   -h,--help                Show this help text

cardano-cli/test/cardano-cli-golden/files/golden/help/experimental_governance_committee_key-hash.cli

@@ -1,8 +1,15 @@
-Usage: cardano-cli experimental governance committee key-hash --verification-key-file FILE
+Usage: cardano-cli experimental governance committee key-hash 
+                                                                ( --verification-key STRING
+                                                                | --verification-key-file FILE
+                                                                )
 
   Print the identifier (hash) of a public key
 
 Available options:
+  --verification-key STRING
+                           Constitutional Committee Member key (hot or cold)
+                           (Bech32-encoded)
   --verification-key-file FILE
-                           Input filepath of the verification key.
+                           Input filepath of the Constitutional Committee Member
+                           key (hot or cold).
   -h,--help                Show this help text