Merge #4894

4894: Re-add support for decoding GenesisExtendedKey text envelope r=newhoggy a=newhoggy

Resolves #4893

Co-authored-by: John Ky <[email protected]>

Author: iohk-bors[bot]

cardano-api/src/Cardano/Api/DeserialiseAnyOf.hs

@@ -311,5 +311,6 @@ deserialiseAnyVerificationKeyTextEnvelope bs =
     , FromSomeType (AsVerificationKey AsPaymentKey) APaymentVerificationKey
     , FromSomeType (AsVerificationKey AsPaymentExtendedKey) APaymentExtendedVerificationKey
     , FromSomeType (AsVerificationKey AsGenesisUTxOKey) AGenesisUTxOVerificationKey
+    , FromSomeType (AsVerificationKey AsGenesisExtendedKey) AGenesisExtendedVerificationKey
     ]
 

cardano-cli/cardano-cli.cabal

@@ -241,6 +241,8 @@ test-suite cardano-cli-golden
                         Test.Golden.Byron.UpdateProposal
                         Test.Golden.Byron.Vote
                         Test.Golden.Byron.Witness
+                        Test.Golden.Key
+                        Test.Golden.Key.NonExtendedKey
                         Test.Golden.Shelley
                         Test.Golden.Shelley.Address.Build
                         Test.Golden.Shelley.Address.Info

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

@@ -0,0 +1,16 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Test.Golden.Key
+  ( keyTests
+  ) where
+
+import qualified Test.Golden.Key.NonExtendedKey
+
+import qualified Hedgehog as H
+
+keyTests :: IO Bool
+keyTests =
+  H.checkSequential
+    $ H.Group "Key command group"
+        [ ("golden_KeyNonExtendedKey", Test.Golden.Key.NonExtendedKey.golden_KeyNonExtendedKey)
+        ]

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

@@ -0,0 +1,39 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+module Test.Golden.Key.NonExtendedKey
+  ( golden_KeyNonExtendedKey
+  ) where
+
+import           Control.Monad (void)
+import           Hedgehog (Property)
+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)
+
+{- HLINT ignore "Use camelCase" -}
+
+-- | Test that converting a @cardano-address@ Byron signing key yields the
+-- expected result.
+golden_KeyNonExtendedKey :: Property
+golden_KeyNonExtendedKey =
+  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"
+
+    H.assertFilesExist [genesisVKeyFp]
+
+    -- Convert the `cardano-address` signing key
+    void $ execCardanoCLI
+      [ "key", "non-extended-key"
+      , "--extended-verification-key-file", genesisVKeyFp
+      , "--verification-key-file", nonExtendedGenesisVKeyFp
+      ]
+
+    -- Check for existence of the converted signing key file
+    H.assertFilesExist [nonExtendedGenesisVKeyFp]
+
+    contents <- H.readFile nonExtendedGenesisVKeyFp
+
+    diffVsGoldenFile contents nonExtendedGenesisVKeyFp

cardano-cli/test/cardano-cli-golden.hs

@@ -4,6 +4,7 @@ import qualified Test.Golden.Byron.SigningKeys
 import qualified Test.Golden.Byron.Tx
 import qualified Test.Golden.Byron.UpdateProposal
 import qualified Test.Golden.Byron.Vote
+import qualified Test.Golden.Key
 import qualified Test.Golden.Shelley
 import qualified Test.Golden.TxView
 
@@ -14,6 +15,7 @@ main =
     , Test.Golden.Byron.Tx.txTests
     , Test.Golden.Byron.UpdateProposal.updateProposalTest
     , Test.Golden.Byron.Vote.voteTests
+    , Test.Golden.Key.keyTests
     , Test.Golden.Shelley.keyTests
     , Test.Golden.Shelley.certificateTests
     , Test.Golden.Shelley.keyConversionTests

cardano-cli/test/data/golden/key/non-extended-keys/shelley.000.vkey

@@ -0,0 +1,5 @@
+{
+    "type": "GenesisExtendedVerificationKey_ed25519_bip32",
+    "description": "",
+    "cborHex": "58400834b58f4bdda9522bb202af1f546db4cbbd94b068ae72c9fd96d9b55279edf0f97694cea85a4926ffeacab704b4a7de037c7f6d078135442a52fe45e39bcace"
+}