key verification-key: support drep and CC keys

IntersectMBO · Mar 19, 2024 · 111f71e · 111f71e
1 parent 7678f7a
commit 111f71e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -721,6 +721,8 @@ readWitnessSigningData (KeyWitnessSigningData skFile mbByronAddr) = do
           -- A Byron address should only be specified along with a Byron signing key.
           Left ReadWitnessSigningDataSigningKeyAndAddressMismatch
   where
+    -- If you update these variables, consider updating the ones with the same
+    -- names in Cardano.CLI.Types.Key
     textEnvFileTypes =
       [ FromSomeType (AsSigningKey AsByronKey                   ) (`AByronSigningWitness` mbByronAddr)
       , FromSomeType (AsSigningKey AsPaymentKey                 ) APaymentSigningWitness

diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs
@@ -355,6 +355,12 @@ data SomeSigningKey
   | AGenesisDelegateSigningKey          (SigningKey GenesisDelegateKey)
   | AGenesisDelegateExtendedSigningKey  (SigningKey GenesisDelegateExtendedKey)
   | AGenesisUTxOSigningKey              (SigningKey GenesisUTxOKey)
+  | ADRepSigningKey                     (SigningKey DRepKey)
+  | ADRepExtendedSigningKey             (SigningKey DRepExtendedKey)
+  | ACommitteeColdSigningKey            (SigningKey CommitteeColdKey)
+  | ACommitteeColdExtendedSigningKey    (SigningKey CommitteeColdExtendedKey)
+  | ACommitteeHotSigningKey             (SigningKey CommitteeHotKey)
+  | ACommitteeHotExtendedSigningKey     (SigningKey CommitteeHotExtendedKey)
   | AVrfSigningKey                      (SigningKey VrfKey)
   | AKesSigningKey                      (SigningKey KesKey)
 
@@ -375,6 +381,12 @@ withSomeSigningKey ssk f =
       AGenesisDelegateSigningKey          sk -> f sk
       AGenesisDelegateExtendedSigningKey  sk -> f sk
       AGenesisUTxOSigningKey              sk -> f sk
+      ADRepSigningKey                     sk -> f sk
+      ADRepExtendedSigningKey             sk -> f sk
+      ACommitteeColdSigningKey            sk -> f sk
+      ACommitteeColdExtendedSigningKey    sk -> f sk
+      ACommitteeHotSigningKey             sk -> f sk
+      ACommitteeHotExtendedSigningKey     sk -> f sk
       AVrfSigningKey                      sk -> f sk
       AKesSigningKey                      sk -> f sk
 
@@ -385,6 +397,8 @@ readSigningKeyFile skFile =
     newExceptT $
       readKeyFileAnyOf bech32FileTypes textEnvFileTypes skFile
   where
+    -- If you update these variables, consider updating the ones with the same
+    -- names in Cardano.CLI.Read
     textEnvFileTypes =
       [ FromSomeType (AsSigningKey AsByronKey)                   AByronSigningKey
       , FromSomeType (AsSigningKey AsPaymentKey)                 APaymentSigningKey
@@ -397,6 +411,12 @@ readSigningKeyFile skFile =
       , FromSomeType (AsSigningKey AsGenesisDelegateKey)         AGenesisDelegateSigningKey
       , FromSomeType (AsSigningKey AsGenesisDelegateExtendedKey) AGenesisDelegateExtendedSigningKey
       , FromSomeType (AsSigningKey AsGenesisUTxOKey)             AGenesisUTxOSigningKey
+      , FromSomeType (AsSigningKey AsDRepKey)                    ADRepSigningKey
+      , FromSomeType (AsSigningKey AsDRepExtendedKey)            ADRepExtendedSigningKey
+      , FromSomeType (AsSigningKey AsCommitteeColdKey)           ACommitteeColdSigningKey
+      , FromSomeType (AsSigningKey AsCommitteeColdExtendedKey)   ACommitteeColdExtendedSigningKey
+      , FromSomeType (AsSigningKey AsCommitteeHotKey)            ACommitteeHotSigningKey
+      , FromSomeType (AsSigningKey AsCommitteeHotExtendedKey)    ACommitteeHotExtendedSigningKey
       , FromSomeType (AsSigningKey AsVrfKey)                     AVrfSigningKey
       , FromSomeType (AsSigningKey AsKesKey)                     AKesSigningKey
       ]
@@ -409,4 +429,4 @@ readSigningKeyFile skFile =
       , FromSomeType (AsSigningKey AsStakePoolKey)       AStakePoolSigningKey
       , FromSomeType (AsSigningKey AsVrfKey)             AVrfSigningKey
       , FromSomeType (AsSigningKey AsKesKey)             AKesSigningKey
-      ]
+      ]