key non-extended-key: support CC keys

cabal.project

@@ -43,3 +43,9 @@ write-ghc-environment-files: always
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+source-repository-package
+   type: git
+   location: https://github.com/IntersectMBO/cardano-api
+   subdir: cardano-api
+   tag: 34b2e14562e40f7e9c25f8f7fb03a6328d0107cd

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

@@ -163,6 +163,10 @@ runNonExtendedKeyCmd
         writeToDisk vkf (Just paymentVkeyDesc) (castVerificationKey vk :: VerificationKey PaymentKey)
       ADRepExtendedVerificationKey vk ->
         writeToDisk vkf (Just drepVkeyDesc) (castVerificationKey vk :: VerificationKey DRepKey)
+      ACommitteeColdExtendedVerificationKey vk ->
+        writeToDisk vkf (Just ccColdVkeyDesc) (castVerificationKey vk :: VerificationKey CommitteeColdKey)
+      ACommitteeHotExtendedVerificationKey vk ->
+        writeToDisk vkf (Just ccHotVkeyDesc) (castVerificationKey vk :: VerificationKey CommitteeHotKey)
       AStakeExtendedVerificationKey vk ->
         writeToDisk vkf (Just stakeVkeyDesc) (castVerificationKey vk :: VerificationKey StakeKey)
       AGenesisExtendedVerificationKey vk ->
@@ -177,6 +181,8 @@ runNonExtendedKeyCmd
       vk@AVrfVerificationKey {}         -> goFail vk
       vk@AStakeVerificationKey {}       -> goFail vk
       vk@ADRepVerificationKey {}        -> goFail vk
+      vk@ACommitteeColdVerificationKey{} -> goFail vk
+      vk@ACommitteeHotVerificationKey{} -> goFail vk
     where
       goFail nonExtendedKey = left $ KeyCmdExpectedExtendedVerificationKey nonExtendedKey
 
@@ -202,6 +208,8 @@ readExtendedVerificationKeyFile evkfile = do
   case vKey of
       k@APaymentExtendedVerificationKey{} -> return k
       k@ADRepExtendedVerificationKey{} -> return k
+      k@ACommitteeColdExtendedVerificationKey{} -> return k
+      k@ACommitteeHotExtendedVerificationKey{} -> return k
       k@AStakeExtendedVerificationKey{} -> return k
       k@AGenesisExtendedVerificationKey{} -> return k
       k@AGenesisDelegateExtendedVerificationKey{} -> return k
@@ -213,6 +221,8 @@ readExtendedVerificationKeyFile evkfile = do
       k@AVrfVerificationKey{}           -> goFail k
       k@AStakeVerificationKey{}         -> goFail k
       k@ADRepVerificationKey{}          -> goFail k
+      k@ACommitteeColdVerificationKey{} -> goFail k
+      k@ACommitteeHotVerificationKey{}  -> goFail k
   where
     goFail k = left $ KeyCmdExpectedExtendedVerificationKey k
 

cardano-cli/test/cardano-cli-golden/Test/Golden/Key/NonExtendedKey.hs

@@ -3,14 +3,14 @@
 module Test.Golden.Key.NonExtendedKey where
 
 import           Control.Monad (void)
+import           Control.Monad.Extra (forM_)
 import           System.FilePath ((</>))
 
 import qualified Test.Cardano.CLI.Util as H
 import           Test.Cardano.CLI.Util (execCardanoCLI, propertyOnce)
 
 import           Hedgehog (Property)
 import qualified Hedgehog.Extras.Test.Base as H
-import qualified Hedgehog.Extras.Test.File as H
 import qualified Hedgehog.Extras.Test.Golden as H
 
 {- HLINT ignore "Use camelCase" -}
@@ -24,8 +24,6 @@ hprop_golden_KeyNonExtendedKey_GenesisExtendedVerificationKey =
     nonExtendedFp <-  H.note "test/cardano-cli-golden/files/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"
@@ -44,8 +42,6 @@ hprop_golden_KeyNonExtendedKey_StakeExtendedVerificationKeyShelley =
     nonExtendedFp <-  H.note "test/cardano-cli-golden/files/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"
@@ -64,8 +60,6 @@ hprop_golden_KeyNonExtendedKey_DRepExtendedVerificationKey =
     goldenFile <-  H.note "test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-drep.vkey"
     outFp <- H.note $ tempDir </> "non-extended-drep.vkey"
 
-    H.assertFilesExist [extendedKeyFile]
-
     void $ execCardanoCLI
       [ "conway", "key", "non-extended-key"
       , "--extended-verification-key-file", extendedKeyFile
@@ -83,12 +77,30 @@ hprop_golden_extended_payment_vkey_to_non_extended_vkey =
     goldenFile <-  H.note "test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-payment.vkey"
     outFp <- H.note $ tempDir </> "non-extended-payment.vkey"
 
-    H.assertFilesExist [extendedKeyFile]
-
     void $ execCardanoCLI
       [ "conway", "key", "non-extended-key"
       , "--extended-verification-key-file", extendedKeyFile
       , "--verification-key-file", outFp
       ]
 
     H.diffFileVsGoldenFile outFp goldenFile
+
+-- | Test that converting a CC extended verification key yields the expected result.
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden extended cc vkey to non extended vkey/"'@
+hprop_golden_extended_cc_vkey_to_non_extended_vkey :: Property
+hprop_golden_extended_cc_vkey_to_non_extended_vkey =
+  let supplyValues = [ "cc-cold.vkey", "cc-hot.vkey" ] in
+  propertyOnce $ forM_ supplyValues $ \suffix->
+    H.moduleWorkspace "tmp" $ \tempDir -> do
+      extendedKeyFile <- H.noteInputFile $ "test/cardano-cli-golden/files/input/key/non-extended-keys/extended-" <> suffix
+      goldenFile <-  H.note $ "test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-" <> suffix
+      outFp <- H.note $ tempDir </> "non-extended-" <> suffix
+
+      void $ execCardanoCLI
+        [ "conway", "key", "non-extended-key"
+        , "--extended-verification-key-file", extendedKeyFile
+        , "--verification-key-file", outFp
+        ]
+
+      H.diffFileVsGoldenFile outFp goldenFile

cardano-cli/test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-cc-cold.vkey

@@ -0,0 +1,5 @@
+{
+    "type": "ConstitutionalCommitteeColdVerificationKey_ed25519",
+    "description": "Constitutional Committee Cold Verification Key",
+    "cborHex": "58200a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39a"
+}

cardano-cli/test/cardano-cli-golden/files/golden/key/non-extended-keys/non-extended-cc-hot.vkey

@@ -0,0 +1,5 @@
+{
+    "type": "ConstitutionalCommitteeHotVerificationKey_ed25519",
+    "description": "Constitutional Committee Hot Verification Key",
+    "cborHex": "5820f010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c"
+}

cardano-cli/test/cardano-cli-golden/files/input/key/non-extended-keys/extended-cc-cold.vkey

@@ -0,0 +1,5 @@
+{
+    "type": "ConstitutionalCommitteeColdExtendedVerificationKey_ed25519_bip32",
+    "description": "",
+    "cborHex": "58400a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39aa7f68837c38ef680b2dc8f047581707a32f6fcade23d4e02177d389002484798"
+}

cardano-cli/test/cardano-cli-golden/files/input/key/non-extended-keys/extended-cc-hot.vkey

@@ -0,0 +1,5 @@
+{
+    "type": "ConstitutionalCommitteeHotExtendedVerificationKey_ed25519_bip32",
+    "description": "",
+    "cborHex": "5840f010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c4f178f20955541ce918a6a1352c32536f22677008f9f918d109663e4d2bdc084"
+}