IntersectMBO
diff --git a/‎.github/workflows/github-page.yml
+4-1 b/‎.github/workflows/github-page.yml
+4-1
diff --git a/‎cardano-api/src/Cardano/Api.hs
+3 b/‎cardano-api/src/Cardano/Api.hs
+3
diff --git a/‎cardano-api/src/Cardano/Api/DeserialiseAnyOf.hs
+1 b/‎cardano-api/src/Cardano/Api/DeserialiseAnyOf.hs
+1
diff --git a/‎cardano-api/src/Cardano/Api/Utils.hs
+16-1 b/‎cardano-api/src/Cardano/Api/Utils.hs
+16-1
diff --git a/‎cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
+5-6 b/‎cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
+5-6
diff --git a/‎cardano-cli/src/Cardano/CLI/Helpers.hs
+11-11 b/‎cardano-cli/src/Cardano/CLI/Helpers.hs
+11-11
diff --git a/‎cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
+37-43 b/‎cardano-cli/src/Cardano/CLI/Shelley/Parsers.hs
+37-43
diff --git a/‎cardano-cli/test/Test/Golden/Key.hs
+6-1 b/‎cardano-cli/test/Test/Golden/Key.hs
+6-1
diff --git a/‎cardano-cli/test/Test/Golden/Key/NonExtendedKey.hs
+32-9 b/‎cardano-cli/test/Test/Golden/Key/NonExtendedKey.hs
+32-9
@@ -1,6 +1,9 @@
 name: "Haddock documentation"
 
-on: [push]
+on:
+  push:
+    branches:
+      - master
 
 jobs:
   build:
 
@@ -750,6 +750,9 @@ module Cardano.Api (
     txInsExistInUTxO,
     notScriptLockedTxIns,
     textShow,
+
+    -- ** CLI option parsing
+    bounded,
   ) where
 
 import           Cardano.Api.Address
 
@@ -310,6 +310,7 @@ deserialiseAnyVerificationKeyTextEnvelope bs =
     [ FromSomeType (AsVerificationKey AsByronKey) AByronVerificationKey
     , FromSomeType (AsVerificationKey AsPaymentKey) APaymentVerificationKey
     , FromSomeType (AsVerificationKey AsPaymentExtendedKey) APaymentExtendedVerificationKey
+    , FromSomeType (AsVerificationKey AsStakeExtendedKey) AStakeExtendedVerificationKey
     , FromSomeType (AsVerificationKey AsGenesisUTxOKey) AGenesisUTxOVerificationKey
     , FromSomeType (AsVerificationKey AsGenesisExtendedKey) AGenesisExtendedVerificationKey
     ]
 
@@ -1,6 +1,9 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE LambdaCase #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 
 #if !defined(mingw32_HOST_OS)
 #define UNIX
@@ -22,10 +25,13 @@ module Cardano.Api.Utils
   , runParsecParser
   , textShow
   , writeSecrets
+
+    -- ** CLI option parsing
+  , bounded
   ) where
 
 import           Control.Exception (bracket)
-import           Control.Monad (forM_)
+import           Control.Monad (forM_, when)
 import qualified Data.Aeson.Types as Aeson
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Builder as Builder
@@ -48,6 +54,9 @@ import           System.Directory (emptyPermissions, readable, setPermissions)
 #endif
 
 import           Cardano.Api.Eras
+import           Options.Applicative (ReadM)
+import           Options.Applicative.Builder (eitherReader)
+import qualified Text.Read as Read
 
 (?!) :: Maybe a -> e -> Either e a
 Nothing ?! e = Left e
@@ -132,3 +141,9 @@ renderEra (AnyCardanoEra MaryEra)    = "Mary"
 renderEra (AnyCardanoEra AlonzoEra)  = "Alonzo"
 renderEra (AnyCardanoEra BabbageEra) = "Babbage"
 
+bounded :: forall a. (Bounded a, Integral a, Show a) => String -> ReadM a
+bounded t = eitherReader $ \s -> do
+  i <- Read.readEither @Integer s
+  when (i < fromIntegral (minBound @a)) $ Left $ t <> " must not be less than " <> show (minBound @a)
+  when (i > fromIntegral (maxBound @a)) $ Left $ t <> " must not greater than " <> show (maxBound @a)
+  pure (fromIntegral i)
@@ -664,12 +664,11 @@ pNetworkId =
 
 pTestnetMagic :: Parser NetworkMagic
 pTestnetMagic =
-  NetworkMagic <$>
-    Opt.option Opt.auto
-      (  Opt.long "testnet-magic"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "Specify a testnet magic id."
-      )
+  fmap NetworkMagic $ Opt.option (bounded "TESTNET_MAGIC") $ mconcat
+    [ Opt.long "testnet-magic"
+    , Opt.metavar "NATURAL"
+    , Opt.help "Specify a testnet magic id."
+    ]
 
 parseNewSigningKeyFile :: String -> Parser NewSigningKeyFile
 parseNewSigningKeyFile opt =
 
@@ -1,5 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.Helpers
   ( HelpersError(..)
@@ -19,12 +20,22 @@ import           Cardano.Prelude (ConvertText (..))
 import           Codec.CBOR.Pretty (prettyHexEnc)
 import           Codec.CBOR.Read (DeserialiseFailure, deserialiseFromBytes)
 import           Codec.CBOR.Term (decodeTerm, encodeTerm)
+import           Control.Exception (Exception (..), IOException)
+import           Control.Monad (unless, when)
+import           Control.Monad.IO.Class (MonadIO (..))
+import           Control.Monad.Trans.Except (ExceptT)
 import           Control.Monad.Trans.Except.Extra (handleIOExceptT, left)
+import           Data.Bifunctor (Bifunctor (..))
+import           Data.ByteString (ByteString)
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as LB
+import           Data.Functor (void)
+import           Data.Text (Text)
 import qualified Data.Text as Text
+import qualified Data.Text.IO as Text
 import qualified System.Console.ANSI as ANSI
 import           System.Console.ANSI
+import qualified System.Directory as IO
 import qualified System.IO as IO
 
 import           Cardano.Binary (Decoder, fromCBOR)
@@ -34,17 +45,6 @@ import qualified Cardano.Chain.Update as Update
 import qualified Cardano.Chain.UTxO as UTxO
 import           Cardano.CLI.Types
 
-import           Control.Exception (Exception (..), IOException)
-import           Control.Monad (unless, when)
-import           Control.Monad.IO.Class (MonadIO (..))
-import           Control.Monad.Trans.Except (ExceptT)
-import           Data.Bifunctor (Bifunctor (..))
-import           Data.ByteString (ByteString)
-import           Data.Functor (void)
-import           Data.Text (Text)
-import qualified Data.Text.IO as Text
-import qualified System.Directory as IO
-
 data HelpersError
   = CBORPrettyPrintError !DeserialiseFailure
   | CBORDecodingError !DeserialiseFailure
 
@@ -1730,31 +1730,28 @@ pSigningKeyFile fdir =
 
 pKesPeriod :: Parser KESPeriod
 pKesPeriod =
-  KESPeriod <$>
-    Opt.option Opt.auto
-      (  Opt.long "kes-period"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "The start of the KES key validity period."
-      )
+  fmap KESPeriod $ Opt.option (bounded "KES_PERIOD") $ mconcat
+    [ Opt.long "kes-period"
+    , Opt.metavar "NATURAL"
+    , Opt.help "The start of the KES key validity period."
+    ]
 
 pEpochNo :: Parser EpochNo
 pEpochNo =
-  EpochNo <$>
-    Opt.option Opt.auto
-      (  Opt.long "epoch"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "The epoch number."
-      )
+  fmap EpochNo $ Opt.option (bounded "EPOCH") $ mconcat
+    [ Opt.long "epoch"
+    , Opt.metavar "NATURAL"
+    , Opt.help "The epoch number."
+    ]
 
 
 pEpochNoUpdateProp :: Parser EpochNo
 pEpochNoUpdateProp =
-  EpochNo <$>
-    Opt.option Opt.auto
-      (  Opt.long "epoch"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "The epoch number in which the update proposal is valid."
-      )
+  fmap EpochNo $ Opt.option (bounded "EPOCH") $ mconcat
+    [ Opt.long "epoch"
+    , Opt.metavar "EPOCH"
+    , Opt.help "The epoch number in which the update proposal is valid."
+    ]
 
 pGenesisFile :: String -> Parser GenesisFile
 pGenesisFile desc =
@@ -2054,12 +2051,11 @@ pNetworkId =
 
 pTestnetMagic :: Parser NetworkMagic
 pTestnetMagic =
-  NetworkMagic <$>
-    Opt.option Opt.auto
-      (  Opt.long "testnet-magic"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "Specify a testnet magic id."
-      )
+  fmap NetworkMagic $ Opt.option (bounded "TESTNET_MAGIC") $ mconcat
+    [ Opt.long "testnet-magic"
+    , Opt.metavar "TESTNET_MAGIC"
+    , Opt.help "Specify a testnet magic id."
+    ]
 
 pTxSubmitFile :: Parser FilePath
 pTxSubmitFile =
@@ -2367,12 +2363,12 @@ pPolicyId =
 
 pInvalidBefore :: Parser SlotNo
 pInvalidBefore = fmap SlotNo $ asum
-  [ Opt.option Opt.auto $ mconcat
+  [ Opt.option (bounded "SLOT") $ mconcat
     [ Opt.long "invalid-before"
     , Opt.metavar "SLOT"
     , Opt.help "Time that transaction is valid from (in slots)."
     ]
-  , Opt.option Opt.auto $ mconcat
+  , Opt.option (bounded "SLOT") $ mconcat
     [ Opt.long "lower-bound"
     , Opt.metavar "SLOT"
     , Opt.help $ mconcat
@@ -2386,12 +2382,12 @@ pInvalidBefore = fmap SlotNo $ asum
 pInvalidHereafter :: Parser SlotNo
 pInvalidHereafter =
   fmap SlotNo $ asum
-  [ Opt.option Opt.auto $ mconcat
+  [ Opt.option (bounded "SLOT") $ mconcat
     [ Opt.long "invalid-hereafter"
     , Opt.metavar "SLOT"
     , Opt.help "Time that transaction is valid until (in slots)."
     ]
-  , Opt.option Opt.auto $ mconcat
+  , Opt.option (bounded "SLOT") $ mconcat
     [ Opt.long "upper-bound"
     , Opt.metavar "SLOT"
     , Opt.help $ mconcat
@@ -2400,7 +2396,7 @@ pInvalidHereafter =
       ]
     , Opt.internal
     ]
-  , Opt.option Opt.auto $ mconcat
+  , Opt.option (bounded "SLOT") $ mconcat
     [ Opt.long "ttl"
     , Opt.metavar "SLOT"
     , Opt.help "Time to live (in slots) (deprecated; use --invalid-hereafter instead)."
@@ -3051,12 +3047,11 @@ pPoolDeposit =
 
 pEpochBoundRetirement :: Parser EpochNo
 pEpochBoundRetirement =
-    EpochNo <$>
-    Opt.option Opt.auto
-      (  Opt.long "pool-retirement-epoch-boundary"
-      <> Opt.metavar "INT"
-      <> Opt.help "Epoch bound on pool retirement."
-      )
+  fmap EpochNo $ Opt.option (bounded "EPOCH_BOUNDARY") $ mconcat
+    [ Opt.long "pool-retirement-epoch-boundary"
+    , Opt.metavar "EPOCH_BOUNDARY"
+    , Opt.help "Epoch bound on pool retirement."
+    ]
 
 pNumberOfPools :: Parser Natural
 pNumberOfPools =
@@ -3248,14 +3243,13 @@ defaultByronEpochSlots = 21600
 
 pEpochSlots :: Parser EpochSlots
 pEpochSlots =
-  EpochSlots <$>
-    Opt.option Opt.auto
-      (  Opt.long "epoch-slots"
-      <> Opt.metavar "NATURAL"
-      <> Opt.help "The number of slots per epoch for the Byron era."
-      <> Opt.value defaultByronEpochSlots -- Default to the mainnet value.
-      <> Opt.showDefault
-      )
+  fmap EpochSlots $ Opt.option (bounded "SLOTS") $ mconcat
+    [ Opt.long "epoch-slots"
+    , Opt.metavar "SLOTS"
+    , Opt.help "The number of slots per epoch for the Byron era."
+    , Opt.value defaultByronEpochSlots -- Default to the mainnet value.
+    , Opt.showDefault
+    ]
 
 pProtocolVersion :: Parser (Natural, Natural)
 pProtocolVersion =
 
@@ -12,5 +12,10 @@ keyTests :: IO Bool
 keyTests =
   H.checkSequential
     $ H.Group "Key command group"
-        [ ("golden_KeyNonExtendedKey", Test.Golden.Key.NonExtendedKey.golden_KeyNonExtendedKey)
+        [ ( "golden_KeyNonExtendedKey_GenesisExtendedVerificationKey"
+          , Test.Golden.Key.NonExtendedKey.golden_KeyNonExtendedKey_GenesisExtendedVerificationKey
+          )
+        , ( "golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley"
+          , Test.Golden.Key.NonExtendedKey.golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley
+          )
         ]
@@ -1,7 +1,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 
 module Test.Golden.Key.NonExtendedKey
-  ( golden_KeyNonExtendedKey
+  ( golden_KeyNonExtendedKey_GenesisExtendedVerificationKey
+  , golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley
   ) where
 
 import           Control.Monad (void)
@@ -10,30 +11,52 @@ import qualified Hedgehog.Extras.Test.Base as H
 import qualified Hedgehog.Extras.Test.File as H
 import           System.FilePath ((</>))
 import           Test.OptParse (execCardanoCLI, propertyOnce)
-import           Test.Utilities (diffVsGoldenFile)
+import           Test.Utilities (diffFileVsGoldenFile)
 
 {- HLINT ignore "Use camelCase" -}
 
 -- | Test that converting a @cardano-address@ Byron signing key yields the
 -- expected result.
-golden_KeyNonExtendedKey :: Property
-golden_KeyNonExtendedKey =
+golden_KeyNonExtendedKey_GenesisExtendedVerificationKey :: Property
+golden_KeyNonExtendedKey_GenesisExtendedVerificationKey =
   propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
     genesisVKeyFp <- H.note "test/data/golden/key/non-extended-keys/shelley.000.vkey"
-    nonExtendedGenesisVKeyFp <- H.note $ tempDir </> "non-extended-shelley.000.vkey"
+    nonExtendedFp <-  H.note "test/data/golden/key/non-extended-keys/non-extended-shelley.000.vkey"
+    outFp <- H.note $ tempDir </> "non-extended-shelley.000.vkey"
 
     H.assertFilesExist [genesisVKeyFp]
 
     -- Convert the `cardano-address` signing key
     void $ execCardanoCLI
       [ "key", "non-extended-key"
       , "--extended-verification-key-file", genesisVKeyFp
-      , "--verification-key-file", nonExtendedGenesisVKeyFp
+      , "--verification-key-file", outFp
       ]
 
     -- Check for existence of the converted signing key file
-    H.assertFilesExist [nonExtendedGenesisVKeyFp]
+    H.assertFilesExist [outFp]
 
-    contents <- H.readFile nonExtendedGenesisVKeyFp
+    diffFileVsGoldenFile outFp nonExtendedFp
 
-    diffVsGoldenFile contents nonExtendedGenesisVKeyFp
+-- | Test that converting a @cardano-address@ Byron signing key yields the
+-- expected result.
+golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley :: Property
+golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    genesisVKeyFp <- H.note "test/data/golden/key/non-extended-keys/stake.000.vkey"
+    nonExtendedFp <-  H.note "test/data/golden/key/non-extended-keys/non-extended-stake.000.vkey"
+    outFp <- H.note $ tempDir </> "non-extended-stake.000.vkey"
+
+    H.assertFilesExist [genesisVKeyFp]
+
+    -- Convert the `cardano-address` signing key
+    void $ execCardanoCLI
+      [ "key", "non-extended-key"
+      , "--extended-verification-key-file", genesisVKeyFp
+      , "--verification-key-file", outFp
+      ]
+
+    -- Check for existence of the converted signing key file
+    H.assertFilesExist [outFp]
+
+    diffFileVsGoldenFile outFp nonExtendedFp
Original file line number	Diff line number	Diff line change
`@@ -310,6 +310,7 @@ deserialiseAnyVerificationKeyTextEnvelope bs =`
`310`	`310`	`[ FromSomeType (AsVerificationKey AsByronKey) AByronVerificationKey`
`311`	`311`	`, FromSomeType (AsVerificationKey AsPaymentKey) APaymentVerificationKey`
`312`	`312`	`, FromSomeType (AsVerificationKey AsPaymentExtendedKey) APaymentExtendedVerificationKey`
	`313`	`+ , FromSomeType (AsVerificationKey AsStakeExtendedKey) AStakeExtendedVerificationKey`
`313`	`314`	`, FromSomeType (AsVerificationKey AsGenesisUTxOKey) AGenesisUTxOVerificationKey`
`314`	`315`	`, FromSomeType (AsVerificationKey AsGenesisExtendedKey) AGenesisExtendedVerificationKey`
`315`	`316`	`]`