Sketch a way to filter DRep queries

cardano-cli/src/Cardano/CLI/EraBased/Commands/Query.hs

@@ -187,7 +187,7 @@ data QueryDRepStateCmdArgs era = QueryDRepStateCmdArgs
   , nodeSocketPath      :: !SocketPath
   , consensusModeParams :: !ConsensusModeParams
   , networkId           :: !NetworkId
-  , drepKeys            :: !(AllOrOnly (VerificationKeyOrHashOrFile DRepKey))
+  , drepSources            :: !(AllOrOnly DRepSource)
   , mOutFile            :: !(Maybe (File () Out))
   } deriving Show
 
@@ -196,7 +196,7 @@ data QueryDRepStakeDistributionCmdArgs era = QueryDRepStakeDistributionCmdArgs
   , nodeSocketPath      :: !SocketPath
   , consensusModeParams :: !ConsensusModeParams
   , networkId           :: !NetworkId
-  , drepKeys            :: !(AllOrOnly (VerificationKeyOrHashOrFile DRepKey))
+  , drepSources            :: !(AllOrOnly DRepSource)
   , mOutFile            :: !(Maybe (File () Out))
   } deriving Show
 

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

@@ -3046,6 +3046,22 @@ pDRepHashSource =
     , DRepHashSourceVerificationKey <$> pDRepVerificationKeyOrHashOrFile
     ]
 
+pDRepSource :: Parser DRepSource
+pDRepSource =
+  asum
+    [ FromHash <$> pDRepHashSource
+    , Opt.flag' AlwaysAbstain $
+        mconcat
+          [ Opt.long "always-abstain"
+          , Opt.help "The trivial DRep that always abstains."
+          ]
+    , Opt.flag' AlwaysNoConfidence $
+        mconcat
+          [ Opt.long "always-no-confidence"
+          , Opt.help "The trivial DRep that always votes no-confidence."
+          ]
+    ]
+
 pDRepScriptHash :: Parser ScriptHash
 pDRepScriptHash =
   Opt.option scriptHashReader $ mconcat
@@ -3062,10 +3078,9 @@ pDRepVerificationKeyOrHashOrFile =
     , VerificationKeyHash <$> pDRepVerificationKeyHash
     ]
 
-pAllOrOnlyDRepVerificationKeyOrHashOrFile
-  :: Parser (AllOrOnly (VerificationKeyOrHashOrFile DRepKey))
-pAllOrOnlyDRepVerificationKeyOrHashOrFile = pAll <|> pOnly
-  where pOnly = Only <$> some pDRepVerificationKeyOrHashOrFile
+pAllOrOnlyDRepSource :: Parser (AllOrOnly DRepSource)
+pAllOrOnlyDRepSource = pAll <|> pOnly
+  where pOnly = Only <$> some pDRepSource
         pAll = Opt.flag' All $ mconcat
           [ Opt.long "all-dreps"
           , Opt.help "Query for all DReps."

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

@@ -322,7 +322,7 @@ pQueryDRepStateCmd era envCli = do
         <$> pSocketPath envCli
         <*> pConsensusModeParams
         <*> pNetworkId envCli
-        <*> pAllOrOnlyDRepVerificationKeyOrHashOrFile
+        <*> pAllOrOnlyDRepSource
         <*> optional pOutputFile
 
 pQueryDRepStakeDistributionCmd :: ()
@@ -341,7 +341,7 @@ pQueryDRepStakeDistributionCmd era envCli = do
       <$> pSocketPath envCli
       <*> pConsensusModeParams
       <*> pNetworkId envCli
-      <*> pAllOrOnlyDRepVerificationKeyOrHashOrFile
+      <*> pAllOrOnlyDRepSource
       <*> optional pOutputFile
 
 pQueryGetCommitteeStateCmd :: ()

cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs

@@ -92,6 +92,7 @@ import           Data.Functor ((<&>))
 import qualified Data.List as List
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
+import           Data.Maybe (mapMaybe)
 import           Data.Proxy (Proxy (..))
 import           Data.Set (Set)
 import qualified Data.Set as Set
@@ -1393,16 +1394,20 @@ runQueryDRepState
       , Cmd.nodeSocketPath
       , Cmd.consensusModeParams
       , Cmd.networkId
-      , Cmd.drepKeys = drepKeys'
+      , Cmd.drepSources
       , Cmd.mOutFile
       } = conwayEraOnwardsConstraints eon $ do
   let localNodeConnInfo = LocalNodeConnectInfo consensusModeParams networkId nodeSocketPath
 
-  let drepKeys = case drepKeys' of
+  let dreps' = case drepSources of
                    All -> []
                    Only l -> l
-  drepCreds <- Set.fromList <$> mapM (firstExceptT QueryCmdDRepKeyError . getDRepCredentialFromVerKeyHashOrFile) drepKeys
+  dreps <- mapM dRepFromSource dreps'
 
+  -- TODO: The queryDRepState expects credentials, but not all DReps are given
+  -- by a credential (namely, not the "always abstain" and "always no
+  -- confidence" one.) So, we filter so that only the credential DReps are left.
+  let drepCreds = Set.fromList $ mapMaybe ( \case Ledger.DRepCredential cred -> Just cred; _ -> Nothing) dreps
   drepState <- runQuery localNodeConnInfo $ queryDRepState eon drepCreds
   writeOutput mOutFile $
     second drepStateToJson <$> Map.assocs drepState
@@ -1422,23 +1427,30 @@ runQueryDRepStakeDistribution
       , Cmd.nodeSocketPath
       , Cmd.consensusModeParams
       , Cmd.networkId
-      , Cmd.drepKeys = drepKeys'
+      , Cmd.drepSources
       , Cmd.mOutFile
       } = conwayEraOnwardsConstraints eon $ do
   let localNodeConnInfo = LocalNodeConnectInfo consensusModeParams networkId nodeSocketPath
 
-  let drepFromVrfKey = fmap Ledger.DRepCredential
-                     . firstExceptT QueryCmdDRepKeyError
-                     . getDRepCredentialFromVerKeyHashOrFile
-      drepKeys = case drepKeys' of
+  let dreps' = case drepSources of
                    All -> []
                    Only l -> l
-  dreps <- Set.fromList <$> mapM drepFromVrfKey drepKeys
+  dreps <- Set.fromList <$> mapM dRepFromSource dreps'
 
   drepStakeDistribution <- runQuery localNodeConnInfo $ queryDRepStakeDistribution eon dreps
   writeOutput mOutFile $
     Map.assocs drepStakeDistribution
 
+dRepFromSource ::  DRepSource -> ExceptT QueryCmdError IO (Ledger.DRep StandardCrypto)
+dRepFromSource (FromHash (DRepHashSourceVerificationKey vk)) = drepFromVrfKey vk
+  where
+    drepFromVrfKey = fmap Ledger.DRepCredential
+                     . firstExceptT QueryCmdDRepKeyError
+                     . getDRepCredentialFromVerKeyHashOrFile
+dRepFromSource (FromHash (DRepHashSourceScript sh)) = return . Ledger.DRepCredential . Ledger.ScriptHashObj $ sh -- TODO: what's the problem here?
+dRepFromSource AlwaysNoConfidence = return Ledger.DRepAlwaysNoConfidence
+dRepFromSource AlwaysAbstain = return Ledger.DRepAlwaysAbstain
+
 runQueryCommitteeMembersState
   :: Cmd.QueryCommitteeMembersStateCmdArgs era
   -> ExceptT QueryCmdError IO ()

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

@@ -41,6 +41,8 @@ module Cardano.CLI.Types.Key
 
   , readDRepCredential
 
+  , DRepSource(..)
+
   , SomeSigningKey(..)
   , withSomeSigningKey
   , readSigningKeyFile
@@ -339,6 +341,7 @@ readDRepCredential = \case
         & onLeft (left . DelegationDRepReadError)
     pure $ L.KeyHashObj drepKeyHash
 
+data DRepSource = FromHash DRepHashSource | AlwaysAbstain | AlwaysNoConfidence deriving (Eq, Show)
 
 data SomeSigningKey
   = AByronSigningKey                    (SigningKey ByronKey)