Misc changes

Jimbo4350 · Jimbo4350 · commit 459d3c31cd1f · 2025-05-15T08:21:36.000-04:00
Review changes
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -137,6 +137,14 @@ library
     Cardano.CLI.EraIndependent.Address.Info.Run
     Cardano.CLI.EraIndependent.Address.Option
     Cardano.CLI.EraIndependent.Address.Run
+    Cardano.CLI.EraIndependent.Cip.Cip129.Command
+    Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
+    Cardano.CLI.EraIndependent.Cip.Cip129.Option
+    Cardano.CLI.EraIndependent.Cip.Cip129.Run
+    Cardano.CLI.EraIndependent.Cip.Command
+    Cardano.CLI.EraIndependent.Cip.Common
+    Cardano.CLI.EraIndependent.Cip.Option
+    Cardano.CLI.EraIndependent.Cip.Run
     Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Command
     Cardano.CLI.EraIndependent.Debug.CheckNodeConfiguration.Run
     Cardano.CLI.EraIndependent.Debug.Command
@@ -177,6 +185,10 @@ library
     Cardano.CLI.Orphan
     Cardano.CLI.Parser
     Cardano.CLI.Read
+    Cardano.CLI.Read.Committee.ColdKey
+    Cardano.CLI.Read.Committee.HotKey 
+    Cardano.CLI.Read.DRep
+    Cardano.CLI.Read.GovernanceActionId
     Cardano.CLI.Render
     Cardano.CLI.Run
     Cardano.CLI.Run.Mnemonic
@@ -282,6 +294,7 @@ library
     transformers-except ^>=0.1.3,
     unliftio-core,
     utf8-string,
+    validation,
     vary ^>=0.1.1.2,
     vector,
     yaml,
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Command.hs
@@ -25,7 +25,6 @@ import Cardano.CLI.Type.Key
 
 import Data.Text (Text)
 import Vary
-import Vary (Vary)
 
 data GovernanceDRepCmds era
   = GovernanceDRepKeyGenCmd !(GovernanceDRepKeyGenCmdArgs era)
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs b/cardano-cli/src/Cardano/CLI/EraBased/Governance/DRep/Option.hs
@@ -23,7 +23,6 @@ import Data.Foldable (asum)
 import Data.Function
 import Options.Applicative (Parser)
 import Options.Applicative qualified as Opt
-import Vary
 
 pGovernanceDRepCmds
   :: ()
@@ -85,22 +84,6 @@ pGovernanceDRepKeyIdCmd era = do
       )
     $ Opt.progDesc "Generate a drep id."
 
-pDRepIdOutputFormat :: Parser (Vary [FormatBech32, FormatHex])
-pDRepIdOutputFormat =
-  asum [make (Vary.from FormatHex) "hex", make (Vary.from FormatBech32) "bech32"]
-    <|> pure default_
- where
-  default_ = Vary.from FormatBech32
-  make format flag_ =
-    Opt.flag' format $
-      mconcat
-        [ Opt.help $
-            "Format drep id output as "
-              <> flag_
-              <> (if format == default_ then " (the default)." else ".")
-        , Opt.long ("output-" <> flag_)
-        ]
-
 -- Registration Certificate related
 
 pRegistrationCertificateCmd
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs b/cardano-cli/src/Cardano/CLI/EraBased/Query/Run.hs
@@ -42,7 +42,7 @@ where
 import Cardano.Api hiding (QueryInShelleyBasedEra (..))
 import Cardano.Api qualified as Api
 import Cardano.Api.Consensus qualified as Consensus
-import Cardano.Api.Ledger (StandardCrypto, strictMaybeToMaybe)
+import Cardano.Api.Ledger (strictMaybeToMaybe)
 import Cardano.Api.Ledger qualified as L
 import Cardano.Api.Network (LedgerPeerSnapshot, Serialised (..))
 import Cardano.Api.Network qualified as Consensus
@@ -1224,7 +1224,7 @@ writePoolState outputFormat mOutFile serialisedCurrentEpochState = do
             <> Map.keysSet (L.psFutureStakePoolParams poolState)
             <> Map.keysSet (L.psRetiring poolState)
 
-  let poolStates :: Map (L.KeyHash 'L.StakePool) (Params StandardCrypto)
+  let poolStates :: Map (L.KeyHash 'L.StakePool) Params
       poolStates =
         fromList $
           hks
diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Internal/Conversion.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Internal/Conversion.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds #-}
 
-module Cardano.CLI.EraIndependent.Cip.Cip129.Conversion
+module Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
   ( encodeCip129DrepVerficationKeyText
   , encodeCip129CommitteeColdVerficationKeyText
   , encodeCip129CommitteeHotVerficationKeyText
diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Option.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Option.hs
@@ -1,4 +1,4 @@
-module Cardano.CLI.EraIndependent.Cip.Cip129.Options
+module Cardano.CLI.EraIndependent.Cip.Cip129.Option
   ( pCip129
   )
 where
@@ -7,7 +7,7 @@ import Cardano.CLI.EraIndependent.Cip.Command
 import Cardano.CLI.EraIndependent.Cip.Common
 import Cardano.CLI.Parser
 
-import Control.Applicative
+import Data.Foldable
 import Options.Applicative qualified as Opt
 
 -- Add sub parsers
diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Run.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Cip129/Run.hs
@@ -9,7 +9,7 @@ import Cardano.Api hiding (Cip129)
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.EraIndependent.Cip.Cip129.Command
-import Cardano.CLI.EraIndependent.Cip.Cip129.Conversion
+import Cardano.CLI.EraIndependent.Cip.Cip129.Internal.Conversion
 import Cardano.CLI.EraIndependent.Cip.Common
 import Cardano.CLI.Orphan ()
 import Cardano.CLI.Read
diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Option.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Cip/Option.hs
@@ -1,10 +1,10 @@
-module Cardano.CLI.EraIndependent.Cip.Options
+module Cardano.CLI.EraIndependent.Cip.Option
   ( parseCipCmd
   )
 where
 
 import Cardano.CLI.Command (ClientCommand (CipFormatCmds))
-import Cardano.CLI.EraIndependent.Cip.Cip129.Options
+import Cardano.CLI.EraIndependent.Cip.Cip129.Option
 import Cardano.CLI.EraIndependent.Cip.Command
 import Cardano.CLI.Parser
 
@@ -27,6 +27,6 @@ pCipFormat =
       Opt.info pCip129 $
         Opt.progDesc $
           mconcat
-            [ "Modified binary encoding of drep keys, constitutional committee cold and hot keys, governance actions."
+            [ "Modified binary encoding of drep keys, constitutional committee cold and hot keys, governance actions. "
             , "https://github.com/cardano-foundation/CIPs/tree/master/CIP-0129"
             ]
diff --git a/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs b/cardano-cli/src/Cardano/CLI/EraIndependent/Key/Run.hs
@@ -37,7 +37,7 @@ import Cardano.Api
 import Cardano.Api.Byron qualified as ByronApi
 import Cardano.Api.Crypto.Ed25519Bip32 (xPrvFromBytes)
 import Cardano.Api.Ledger qualified as L
-import Cardano.Api.Shelley (StakePoolKey)
+import Cardano.Api.Shelley
 
 import Cardano.CLI.Byron.Key qualified as Byron
 import Cardano.CLI.EraIndependent.Key.Command qualified as Cmd
@@ -205,8 +205,8 @@ runNonExtendedKeyCmd
         vk@AGenesisUTxOVerificationKey{} -> goFail vk
         vk@AKesVerificationKey{} -> goFail vk
         vk@AVrfVerificationKey{} -> goFail vk
-        vk@AStakeVerificationKey{} -> goFail vk
         vk@AStakePoolVerificationKey{} -> goFail vk
+        vk@AStakeVerificationKey{} -> goFail vk
         vk@ADRepVerificationKey{} -> goFail vk
         vk@ACommitteeColdVerificationKey{} -> goFail vk
         vk@ACommitteeHotVerificationKey{} -> goFail vk
@@ -245,18 +245,18 @@ readExtendedVerificationKeyFile evkfile = do
     k@ADRepExtendedVerificationKey{} -> return k
     k@ACommitteeColdExtendedVerificationKey{} -> return k
     k@ACommitteeHotExtendedVerificationKey{} -> return k
+    k@AStakePoolExtendedVerificationKey{} -> return k
     k@AStakeExtendedVerificationKey{} -> return k
     k@AGenesisExtendedVerificationKey{} -> return k
     k@AGenesisDelegateExtendedVerificationKey{} -> return k
-    k@AStakePoolExtendedVerificationKey{} -> return k
     -- Non-extended keys are below and cause failure.
     k@AByronVerificationKey{} -> goFail k
     k@APaymentVerificationKey{} -> goFail k
     k@AGenesisUTxOVerificationKey{} -> goFail k
     k@AKesVerificationKey{} -> goFail k
     k@AVrfVerificationKey{} -> goFail k
-    k@AStakeVerificationKey{} -> goFail k
     k@AStakePoolVerificationKey{} -> goFail k
+    k@AStakeVerificationKey{} -> goFail k
     k@ADRepVerificationKey{} -> goFail k
     k@ACommitteeColdVerificationKey{} -> goFail k
     k@ACommitteeHotVerificationKey{} -> goFail k
diff --git a/cardano-cli/src/Cardano/CLI/Option.hs b/cardano-cli/src/Cardano/CLI/Option.hs
@@ -16,7 +16,7 @@ import Cardano.CLI.EraBased.Common.Option
 import Cardano.CLI.EraBased.Option
 import Cardano.CLI.EraBased.Query.Option (pQueryCmdsTopLevel)
 import Cardano.CLI.EraIndependent.Address.Option
-import Cardano.CLI.EraIndependent.Cip.Options
+import Cardano.CLI.EraIndependent.Cip.Option
 import Cardano.CLI.EraIndependent.Debug.Option
 import Cardano.CLI.EraIndependent.Hash.Option
 import Cardano.CLI.EraIndependent.Key.Option
diff --git a/cardano-cli/src/Cardano/CLI/Orphan.hs b/cardano-cli/src/Cardano/CLI/Orphan.hs
@@ -19,6 +19,7 @@ import Cardano.Ledger.Conway.Governance qualified as L
 import Cardano.Ledger.State qualified as L
 
 import Data.Aeson
+import Text.Parsec qualified as Text
 
 instance ToJSON L.DefaultVote where
   toJSON defaultVote =
@@ -27,6 +28,15 @@ instance ToJSON L.DefaultVote where
       L.DefaultAbstain -> String "DefaultAbstain"
       L.DefaultNoConfidence -> String "DefaultNoConfidence"
 
+instance Error [Bech32DecodeError] where
+  prettyError errs = vsep $ map prettyError errs
+
+instance Error [RawBytesHexError] where
+  prettyError errs = vsep $ map prettyError errs
+
+instance Error Text.ParseError where
+  prettyError = pretty . show
+
 instance Error (VotesMergingConflict era) where
   prettyError = pretty . show
 
diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -68,6 +68,7 @@ module Cardano.CLI.Read
   , fileOrPipePath
   , fileOrPipeCache
   , readFileOrPipe
+  , readFileOrPipeTextEnvelopeAnyOf
 
     -- * Stake credentials
   , getStakeCredentialFromVerifier
diff --git a/cardano-cli/src/Cardano/CLI/Read/Committee/ColdKey.hs b/cardano-cli/src/Cardano/CLI/Read/Committee/ColdKey.hs
@@ -25,7 +25,8 @@ import Data.Text (Text)
 import Data.Validation
 
 data AnyCommitteeColdVerificationKey where
-  AnyCommitteeColdVerificationKey :: VerificationKey CommitteeColdKey -> AnyCommitteeColdVerificationKey
+  AnyCommitteeColdVerificationKey
+    :: VerificationKey CommitteeColdKey -> AnyCommitteeColdVerificationKey
   AnyCommitteeColdExtendedVerificationKey
     :: VerificationKey CommitteeColdExtendedKey -> AnyCommitteeColdVerificationKey
 
@@ -37,11 +38,11 @@ readCommitteeColdBech32VerificationKeyText committeeColdText =
   let vkey =
         liftError return $
           AnyCommitteeColdVerificationKey
-            <$> deserialiseFromBech32 (AsVerificationKey AsCommitteeColdKey) committeeColdText
+            <$> deserialiseFromBech32 committeeColdText
       extendedVkey =
         liftError return $
           AnyCommitteeColdExtendedVerificationKey
-            <$> deserialiseFromBech32 (AsVerificationKey AsCommitteeColdExtendedKey) committeeColdText
+            <$> deserialiseFromBech32 committeeColdText
    in vkey <> extendedVkey
 
 readCommitteeColdHexVerificationKeyText
@@ -51,11 +52,11 @@ readCommitteeColdHexVerificationKeyText committeeColdText =
       vkey =
         liftError return $
           AnyCommitteeColdVerificationKey
-            <$> deserialiseFromRawBytesHex (AsVerificationKey AsCommitteeColdKey) committeeColdBs
+            <$> deserialiseFromRawBytesHex committeeColdBs
       extendedVkey =
         liftError return $
           AnyCommitteeColdExtendedVerificationKey
-            <$> deserialiseFromRawBytesHex (AsVerificationKey AsCommitteeColdExtendedKey) committeeColdBs
+            <$> deserialiseFromRawBytesHex committeeColdBs
    in vkey <> extendedVkey
 
 readCommitteeColdVerificationKeyFile
diff --git a/cardano-cli/src/Cardano/CLI/Read/Committee/HotKey.hs b/cardano-cli/src/Cardano/CLI/Read/Committee/HotKey.hs
@@ -37,11 +37,11 @@ readCommitteeHotBech32VerificationKeyText committeeHot =
   let vkey =
         liftError return $
           AnyCommitteeHotVerificationKey
-            <$> deserialiseFromBech32 (AsVerificationKey AsCommitteeHotKey) committeeHot
+            <$> deserialiseFromBech32 committeeHot
       extendedVkey =
         liftError return $
           AnyCommitteeHotExtendedVerificationKey
-            <$> deserialiseFromBech32 (AsVerificationKey AsCommitteeHotExtendedKey) committeeHot
+            <$> deserialiseFromBech32 committeeHot
    in vkey <> extendedVkey
 
 readCommitteeHotHexVerificationKeyText
@@ -51,11 +51,11 @@ readCommitteeHotHexVerificationKeyText committeeHotText =
       vkey =
         liftError return $
           AnyCommitteeHotVerificationKey
-            <$> deserialiseFromRawBytesHex (AsVerificationKey AsCommitteeHotKey) committeeHotBs
+            <$> deserialiseFromRawBytesHex committeeHotBs
       extendedVkey =
         liftError return $
           AnyCommitteeHotExtendedVerificationKey
-            <$> deserialiseFromRawBytesHex (AsVerificationKey AsCommitteeHotExtendedKey) committeeHotBs
+            <$> deserialiseFromRawBytesHex committeeHotBs
    in vkey <> extendedVkey
 
 readCommitteeHotVerificationKeyFile
diff --git a/cardano-cli/src/Cardano/CLI/Read/DRep.hs b/cardano-cli/src/Cardano/CLI/Read/DRep.hs
@@ -1,10 +1,9 @@
-
+{-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE StandaloneDeriving #-}
-{-# LANGUAGE FlexibleInstances #-}
 
 module Cardano.CLI.Read.DRep
-  ( AnyDrepVerificationKey(..)
+  ( AnyDrepVerificationKey (..)
 
     -- * Read bech32 or hex encoded DRep verification key
   , readDRepBech32VerificationKeyText
@@ -15,40 +14,49 @@ module Cardano.CLI.Read.DRep
   )
 where
 
-import Prelude
 import Cardano.Api
-import Data.Validation
-import Data.Text (Text)
-import qualified Cardano.Prelude as Text
-import Cardano.CLI.Read
 
+import Cardano.CLI.Read
+import Cardano.Prelude qualified as Text
 
+import Prelude
 
+import Data.Text (Text)
+import Data.Validation
 
-data AnyDrepVerificationKey where 
-    AnyDrepVerificationKey :: VerificationKey DRepKey -> AnyDrepVerificationKey
-    AnyDrepExtendedVerificationKey :: VerificationKey DRepExtendedKey -> AnyDrepVerificationKey
+data AnyDrepVerificationKey where
+  AnyDrepVerificationKey :: VerificationKey DRepKey -> AnyDrepVerificationKey
+  AnyDrepExtendedVerificationKey :: VerificationKey DRepExtendedKey -> AnyDrepVerificationKey
 
 deriving instance Show AnyDrepVerificationKey
 
 readDRepBech32VerificationKeyText :: Text -> Validation [Bech32DecodeError] AnyDrepVerificationKey
-readDRepBech32VerificationKeyText drep = 
-    let vkey = liftError return $ AnyDrepVerificationKey <$> deserialiseFromBech32 (AsVerificationKey AsDRepKey) drep
-        extendedVkey = liftError return $ AnyDrepExtendedVerificationKey <$> deserialiseFromBech32 (AsVerificationKey AsDRepExtendedKey) drep
-    in vkey <> extendedVkey 
+readDRepBech32VerificationKeyText drep =
+  let vkey =
+        liftError return $
+          AnyDrepVerificationKey <$> deserialiseFromBech32 drep
+      extendedVkey =
+        liftError return $
+          AnyDrepExtendedVerificationKey <$> deserialiseFromBech32 drep
+   in vkey <> extendedVkey
 
 readDRepHexVerificationKeyText :: Text -> Validation [RawBytesHexError] AnyDrepVerificationKey
-readDRepHexVerificationKeyText drepText = 
-    let drepBs = Text.encodeUtf8 drepText
-        vkey = liftError return $ AnyDrepVerificationKey <$> deserialiseFromRawBytesHex (AsVerificationKey AsDRepKey) drepBs
-        extendedVkey = liftError return $ AnyDrepExtendedVerificationKey <$> deserialiseFromRawBytesHex (AsVerificationKey AsDRepExtendedKey) drepBs
-    in vkey <> extendedVkey 
-
-
-readDrepVerificationKeyFile 
+readDRepHexVerificationKeyText drepText =
+  let drepBs = Text.encodeUtf8 drepText
+      vkey =
+        liftError return $
+          AnyDrepVerificationKey <$> deserialiseFromRawBytesHex drepBs
+      extendedVkey =
+        liftError return $
+          AnyDrepExtendedVerificationKey
+            <$> deserialiseFromRawBytesHex drepBs
+   in vkey <> extendedVkey
+
+readDrepVerificationKeyFile
   :: FileOrPipe -> IO (Either (FileError TextEnvelopeError) AnyDrepVerificationKey)
-readDrepVerificationKeyFile = readFileOrPipeTextEnvelopeAnyOf types 
+readDrepVerificationKeyFile = readFileOrPipeTextEnvelopeAnyOf types
  where
-  types = [ FromSomeType (AsVerificationKey AsDRepKey) AnyDrepVerificationKey
-          , FromSomeType (AsVerificationKey AsDRepExtendedKey) AnyDrepExtendedVerificationKey
-          ]
+  types =
+    [ FromSomeType (AsVerificationKey AsDRepKey) AnyDrepVerificationKey
+    , FromSomeType (AsVerificationKey AsDRepExtendedKey) AnyDrepExtendedVerificationKey
+    ]
