Merge pull request #1009 from IntersectMBO/smelc/drep-id-extension-to…

…-key-hashes drep id: support key hash
IntersectMBO · Jan 8, 2025 · 5c76870 · 5c76870
2 parents 56c5420 + 9f7eb2d
commit 5c76870
Show file tree

Hide file tree

Showing 9 changed files with 37 additions and 6 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs
@@ -42,7 +42,7 @@ data GovernanceDRepKeyGenCmdArgs era
 data GovernanceDRepIdCmdArgs era
   = GovernanceDRepIdCmdArgs
   { eon :: !(ConwayEraOnwards era)
-  , vkeySource :: !(VerificationKeyOrFile DRepKey)
+  , vkeySource :: !(VerificationKeyOrHashOrFile DRepKey)
   , idOutputFormat :: !IdOutputFormat
   , mOutFile :: !(Maybe (File () Out))
   }

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs
@@ -75,7 +75,7 @@ pGovernanceDRepKeyIdCmd era = do
     $ Opt.info
       ( fmap GovernanceDRepIdCmd $
           GovernanceDRepIdCmdArgs w
-            <$> pDRepVerificationKeyOrFile
+            <$> pDRepVerificationKeyOrHashOrFile
             <*> pDRepIdOutputFormat
             <*> optional pOutputFile
       )

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs
@@ -84,14 +84,14 @@ runGovernanceDRepIdCmd
     , idOutputFormat
     , mOutFile
     } = do
-    drepVerKey <-
+    drepVerKeyHash <-
       modifyError ReadFileError $
-        readVerificationKeyOrTextEnvFile AsDRepKey vkeySource
+        readVerificationKeyOrHashOrTextEnvFile AsDRepKey vkeySource
 
     content <-
       pure $ case idOutputFormat of
-        IdOutputFormatHex -> serialiseToRawBytesHex $ verificationKeyHash drepVerKey
-        IdOutputFormatBech32 -> Text.encodeUtf8 $ serialiseToBech32 $ verificationKeyHash drepVerKey
+        IdOutputFormatHex -> serialiseToRawBytesHex drepVerKeyHash
+        IdOutputFormatBech32 -> Text.encodeUtf8 $ serialiseToBech32 drepVerKeyHash
 
     lift (writeByteStringOutput mOutFile content)
       & onLeft (left . WriteFileError)

diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/DRep.hs
@@ -122,6 +122,24 @@ hprop_golden_governance_drep_id_hex =
 
     H.diffFileVsGoldenFile idFile idGold
 
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden governance drep id hash/"'@
+hprop_golden_governance_drep_id_hash :: Property
+hprop_golden_governance_drep_id_hash = propertyOnce $ do
+    idGold <- H.note "test/cardano-cli-golden/files/golden/governance/drep/drep.id.hash"
+
+    output <-
+      execCardanoCLI
+        [ "conway"
+        , "governance"
+        , "drep"
+        , "id"
+        , "--drep-key-hash"
+        , "c1a342f0dfb82b93ca2e6b406bacb04802f7d56a99d8f95a80a8b6c5"
+        ]
+
+    H.diffVsGoldenFile output idGold
+
 hprop_golden_governance_drep_extended_key_signing :: Property
 hprop_golden_governance_drep_extended_key_signing =
   propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.hash b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.hash
@@ -0,0 +1 @@
+drep1cx359uxlhq4e8j3wddqxht9sfqp004t2n8v0jk5q4zmv27sh0h5
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli
@@ -7087,6 +7087,7 @@ Usage: cardano-cli conway governance drep key-gen --verification-key-file FILEPA
 Usage: cardano-cli conway governance drep id 
                                                ( --drep-verification-key STRING
                                                | --drep-verification-key-file FILEPATH
+                                               | --drep-key-hash HASH
                                                )
                                                [--output-format STRING]
                                                [--out-file FILEPATH]
@@ -9107,6 +9108,7 @@ Usage: cardano-cli latest governance drep key-gen --verification-key-file FILEPA
 Usage: cardano-cli latest governance drep id 
                                                ( --drep-verification-key STRING
                                                | --drep-verification-key-file FILEPATH
+                                               | --drep-key-hash HASH
                                                )
                                                [--output-format STRING]
                                                [--out-file FILEPATH]
@@ -11729,6 +11731,7 @@ Usage: cardano-cli compatible conway governance drep key-gen --verification-key-
 Usage: cardano-cli compatible conway governance drep id 
                                                           ( --drep-verification-key STRING
                                                           | --drep-verification-key-file FILEPATH
+                                                          | --drep-key-hash HASH
                                                           )
                                                           [--output-format STRING]
                                                           [--out-file FILEPATH]

diff --git a/...no-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_drep_id.cli b/...no-cli/test/cardano-cli-golden/files/golden/help/compatible_conway_governance_drep_id.cli
@@ -1,6 +1,7 @@
 Usage: cardano-cli compatible conway governance drep id 
                                                           ( --drep-verification-key STRING
                                                           | --drep-verification-key-file FILEPATH
+                                                          | --drep-key-hash HASH
                                                           )
                                                           [--output-format STRING]
                                                           [--out-file FILEPATH]
@@ -12,6 +13,8 @@ Available options:
                            DRep verification key (Bech32 or hex-encoded).
   --drep-verification-key-file FILEPATH
                            Filepath of the DRep verification key.
+  --drep-key-hash HASH     DRep verification key hash (either Bech32-encoded or
+                           hex-encoded).
   --output-format STRING   Optional drep id output format. Accepted output
                            formats are "hex" and "bech32" (default is "bech32").
   --out-file FILEPATH      The output file.

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_id.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_id.cli
@@ -1,6 +1,7 @@
 Usage: cardano-cli conway governance drep id 
                                                ( --drep-verification-key STRING
                                                | --drep-verification-key-file FILEPATH
+                                               | --drep-key-hash HASH
                                                )
                                                [--output-format STRING]
                                                [--out-file FILEPATH]
@@ -12,6 +13,8 @@ Available options:
                            DRep verification key (Bech32 or hex-encoded).
   --drep-verification-key-file FILEPATH
                            Filepath of the DRep verification key.
+  --drep-key-hash HASH     DRep verification key hash (either Bech32-encoded or
+                           hex-encoded).
   --output-format STRING   Optional drep id output format. Accepted output
                            formats are "hex" and "bech32" (default is "bech32").
   --out-file FILEPATH      The output file.

diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_id.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_id.cli
@@ -1,6 +1,7 @@
 Usage: cardano-cli latest governance drep id 
                                                ( --drep-verification-key STRING
                                                | --drep-verification-key-file FILEPATH
+                                               | --drep-key-hash HASH
                                                )
                                                [--output-format STRING]
                                                [--out-file FILEPATH]
@@ -12,6 +13,8 @@ Available options:
                            DRep verification key (Bech32 or hex-encoded).
   --drep-verification-key-file FILEPATH
                            Filepath of the DRep verification key.
+  --drep-key-hash HASH     DRep verification key hash (either Bech32-encoded or
+                           hex-encoded).
   --output-format STRING   Optional drep id output format. Accepted output
                            formats are "hex" and "bech32" (default is "bech32").
   --out-file FILEPATH      The output file.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		drep1cx359uxlhq4e8j3wddqxht9sfqp004t2n8v0jk5q4zmv27sh0h5