From e6e42e24f98ee41677e423b8ac5b92a5fbfd12bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 7 Feb 2025 16:09:02 +0100 Subject: [PATCH 1/2] drep id: change output to honor CIP129 --- .../src/Cardano/CLI/EraBased/Run/Governance/DRep.hs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs index c9e495c8d6..f2ec4dcf2f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs @@ -88,10 +88,11 @@ runGovernanceDRepIdCmd modifyError ReadFileError $ readVerificationKeyOrHashOrTextEnvFile AsDRepKey vkeySource - content <- - pure $ case idOutputFormat of - IdOutputFormatHex -> serialiseToRawBytesHex drepVerKeyHash - IdOutputFormatBech32 -> Text.encodeUtf8 $ serialiseToBech32 drepVerKeyHash + let keyType = Text.encodeUtf8 "22" + content = + case idOutputFormat of + IdOutputFormatHex -> serialiseToRawBytesHex drepVerKeyHash + IdOutputFormatBech32 -> Text.encodeUtf8 $ serialiseToBech32CIP129 keyType drepVerKeyHash lift (writeByteStringOutput mOutFile content) & onLeft (left . WriteFileError) From 840e66e90e57c848673795eb60d08e46874b7b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 7 Feb 2025 16:09:08 +0100 Subject: [PATCH 2/2] Adapt golden files --- .../files/golden/governance/drep/drep.id.bech32 | 2 +- .../files/golden/governance/drep/drep.id.hash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.bech32 b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.bech32 index 524c084e68..e7cee9d5c6 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.bech32 +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/drep/drep.id.bech32 @@ -1 +1 @@ -drep1avya24t2308yyyr5uw2dqtreemvkwst90dx00j5fj5556meyztm \ No newline at end of file +drep1xgewkzw4244ghnjzzp6w89xs93uuakt8g9jhkn8he2ye222dygt8nr \ No newline at end of file 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 index 39c85c3ccf..40b1c44785 100644 --- 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 @@ -1 +1 @@ -drep1cx359uxlhq4e8j3wddqxht9sfqp004t2n8v0jk5q4zmv27sh0h5 \ No newline at end of file +drep1xgevrg6z7r0ms2uneghxksrt4jcysqhh644fnk8et2q23dk9wxfze4 \ No newline at end of file