Merge branch 'cl/testnetdata' of github.com:IntersectMBO/cardano-cli …

…into cl/testnetdata
IntersectMBO · Feb 7, 2024 · 23d6c2e · 23d6c2e
2 parents 6d6a951 + 33e0ddd
commit 23d6c2e
Show file tree

Hide file tree

Showing 9 changed files with 103 additions and 1 deletion.
diff --git a/cardano-cli/CHANGELOG.md b/cardano-cli/CHANGELOG.md
@@ -1,5 +1,40 @@
 # Changelog for cardano-cli
 
+## 8.20.0.0
+
+- - Bump CHaP in preparation for cardano-node 8.8
+  - `--pool-retirement-epoch-boundary` updated to `--pool-retirement-epoch-interval`
+  (breaking)
+  [PR 529](https://github.com/IntersectMBO/cardano-cli/pull/529)
+
+- create-testnet-data: better UX for supply arguments: have a flag for total supply and delegated supply is a fraction of that.
+  (breaking)
+  [PR 581](https://github.com/IntersectMBO/cardano-cli/pull/581)
+
+- Provide more detailed error upon missing policy id
+  (improvement)
+  [PR 527](https://github.com/IntersectMBO/cardano-cli/pull/527)
+
+- Bump hedgehog-extras to 0.6.0.1 to benefit of this fix: https://github.com/input-output-hk/hedgehog-extras/pull/58
+  (compatible, test, release)
+  [PR 589](https://github.com/IntersectMBO/cardano-cli/pull/589)
+
+- Avoid an internal crash of `create-testnet-data`
+  (compatible, bugfix)
+  [PR 588](https://github.com/IntersectMBO/cardano-cli/pull/588)
+
+- Update help for `drep-stake-distribution` and `drep-state` queries
+  (improvement, test)
+  [PR 585](https://github.com/IntersectMBO/cardano-cli/pull/585)
+
+- Improvements to --create-testnet-data
+  (compatible, test)
+  [PR 575](https://github.com/IntersectMBO/cardano-cli/pull/575)
+
+- Support signing with drep extended key
+  (feature, compatible)
+  [PR 556](https://github.com/IntersectMBO/cardano-cli/pull/556)
+
 ## 8.19.0.0
 
 - Update cardano-api 8.37.1

diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -1,7 +1,7 @@
 cabal-version: 3.4
 
 name:                   cardano-cli
-version:                8.19.0.0
+version:                8.20.0.0
 synopsis:               The Cardano command-line interface
 description:            The Cardano command-line interface.
 copyright:              2020-2023 Input Output Global Inc (IOG).

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
@@ -21,6 +21,7 @@ import           Data.Maybe
 import           Data.Word (Word64)
 import           Options.Applicative hiding (help, str)
 import qualified Options.Applicative as Opt
+import           Data.Foldable
 
 {- HLINT ignore "Use <$>" -}
 {- HLINT ignore "Move brackets to avoid $" -}

diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs
@@ -640,7 +640,9 @@ data SomeSigningWitness
   | ADRepSigningWitness                     (SigningKey DRepKey)
   | ADRepExtendedSigningWitness             (SigningKey DRepExtendedKey)
   | ACommitteeColdSigningWitness            (SigningKey CommitteeColdKey)
+  | ACommitteeColdExtendedSigningWitness    (SigningKey CommitteeColdExtendedKey)
   | ACommitteeHotSigningWitness             (SigningKey CommitteeHotKey)
+  | ACommitteeHotExtendedSigningWitness     (SigningKey CommitteeHotExtendedKey)
   deriving Show
 
 
@@ -677,7 +679,9 @@ categoriseSomeSigningWitness swsk =
     ADRepSigningWitness                     sk      -> AShelleyKeyWitness (WitnessDRepKey                         sk)
     ADRepExtendedSigningWitness             sk      -> AShelleyKeyWitness (WitnessDRepExtendedKey                 sk)
     ACommitteeColdSigningWitness            sk      -> AShelleyKeyWitness (WitnessCommitteeColdKey                sk)
+    ACommitteeColdExtendedSigningWitness    sk      -> AShelleyKeyWitness (WitnessCommitteeColdExtendedKey        sk)
     ACommitteeHotSigningWitness             sk      -> AShelleyKeyWitness (WitnessCommitteeHotKey                 sk)
+    ACommitteeHotExtendedSigningWitness     sk      -> AShelleyKeyWitness (WitnessCommitteeHotExtendedKey         sk)
 
 data ReadWitnessSigningDataError
   = ReadWitnessSigningDataSigningKeyDecodeError !(FileError InputDecodeError)
@@ -727,7 +731,9 @@ readWitnessSigningData (KeyWitnessSigningData skFile mbByronAddr) = do
       , FromSomeType (AsSigningKey AsDRepKey                    ) ADRepSigningWitness
       , FromSomeType (AsSigningKey AsDRepExtendedKey            ) ADRepExtendedSigningWitness
       , FromSomeType (AsSigningKey AsCommitteeColdKey           ) ACommitteeColdSigningWitness
+      , FromSomeType (AsSigningKey AsCommitteeColdExtendedKey   ) ACommitteeColdExtendedSigningWitness
       , FromSomeType (AsSigningKey AsCommitteeHotKey            ) ACommitteeHotSigningWitness
+      , FromSomeType (AsSigningKey AsCommitteeHotExtendedKey    ) ACommitteeHotExtendedSigningWitness
       ]
 
     bech32FileTypes =

diff --git a/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs b/cardano-cli/test/cardano-cli-golden/Test/Golden/Governance/Committee.hs
@@ -181,3 +181,43 @@ hprop_golden_governanceUpdateCommittee =
       ]
 
     H.diffFileVsGoldenFile outFile goldenAnswerFile
+
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden governance committee cold extended key signing/"'@
+hprop_golden_governance_committee_cold_extended_key_signing :: Property
+hprop_golden_governance_committee_cold_extended_key_signing =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    skeyFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/committee/cc.extended.cold.skey"
+    txBody <- noteInputFile "test/cardano-cli-golden/files/input/governance/drep/extended-key-signing/tx.body"
+
+    outGold <- H.note "test/cardano-cli-golden/files/golden/governance/committee/tx.cold.extended.signed"
+    outFile <- H.noteTempFile tempDir "outFile"
+
+    H.noteM_ $ execCardanoCLI
+      [  "conway", "transaction", "sign"
+      , "--tx-body-file", txBody
+      , "--signing-key-file", skeyFile
+      , "--out-file", outFile
+      ]
+
+    H.diffFileVsGoldenFile outFile outGold
+
+-- | Execute me with:
+-- @cabal test cardano-cli-golden --test-options '-p "/golden governance committee hot extended key signing/"'@
+hprop_golden_governance_committee_hot_extended_key_signing :: Property
+hprop_golden_governance_committee_hot_extended_key_signing =
+  propertyOnce . H.moduleWorkspace "tmp" $ \tempDir -> do
+    skeyFile <- noteInputFile "test/cardano-cli-golden/files/input/governance/committee/cc.extended.hot.skey"
+    txBody <- noteInputFile "test/cardano-cli-golden/files/input/governance/drep/extended-key-signing/tx.body"
+
+    outGold <- H.note "test/cardano-cli-golden/files/golden/governance/committee/tx.hot.extended.signed"
+    outFile <- H.noteTempFile tempDir "outFile"
+
+    H.noteM_ $ execCardanoCLI
+      [  "conway", "transaction", "sign"
+      , "--tx-body-file", txBody
+      , "--signing-key-file", skeyFile
+      , "--out-file", outFile
+      ]
+
+    H.diffFileVsGoldenFile outFile outGold
diff --git a/...ano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.cold.extended.signed b/...ano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.cold.extended.signed
@@ -0,0 +1,5 @@
+{
+    "type": "Witnessed Tx ConwayEra",
+    "description": "Ledger Cddl Format",
+    "cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d90102818258200a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39a58400598eecd84e9467182b4b027d1d30f0ba54b84367042e805bd817644d5f7905bc5c27c99c4f403226c069d972c8e1ad9adfd1b4945345b65b339cdfa6ae46100f5f6"
+}
diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.hot.extended.signed b/cardano-cli/test/cardano-cli-golden/files/golden/governance/committee/tx.hot.extended.signed
@@ -0,0 +1,5 @@
+{
+    "type": "Witnessed Tx ConwayEra",
+    "description": "Ledger Cddl Format",
+    "cborHex": "84a50081825820829e3fd4847f53f0291370fc900b24cc7c7cc4f69676bbed9ca6e281dae9d60a00018182581d6063a11787740d8c90b6d335eefb8bb2f9e23066a3340e8c89d31ed74e1a002b2d03021a000299bd031a010f14d904d901028184108200581c8f4fefcf28017a57b41517a67d56ef4c0dc04181a11d35178dd53f4c1a001e8480f6a100d9010281825820f010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c584053eb4711d6cf2c9985c36e32d4bdfada2de85fc7c7ad1ac3a8ecb69843f5bc1897acca423934ac9596bf7eeb3e5ab33a43de895e17e786ae3e6df840e8097802f5f6"
+}
diff --git a/cardano-cli/test/cardano-cli-golden/files/input/governance/committee/cc.extended.cold.skey b/cardano-cli/test/cardano-cli-golden/files/input/governance/committee/cc.extended.cold.skey
@@ -0,0 +1,5 @@
+{
+  "type": "ConstitutionalCommitteeColdExtendedSigningKey_ed25519_bip32",
+  "description": "Constitutional Committee Cold Extended Signing Key",
+  "cborHex": "5880c8b1f328da856c2b3a2534a2338de9a460a1034f02404e019b8925582c55b94724765b6ee5964393ba66f048f6d8b94e2395686af82a87f13ed4af4f7ee9beff0a9d35aa5299580a67b1e43a3a4b6d43ef29c94e56c51ce4c17e9a53c1d0f39aa7f68837c38ef680b2dc8f047581707a32f6fcade23d4e02177d389002484798"
+}
diff --git a/cardano-cli/test/cardano-cli-golden/files/input/governance/committee/cc.extended.hot.skey b/cardano-cli/test/cardano-cli-golden/files/input/governance/committee/cc.extended.hot.skey
@@ -0,0 +1,5 @@
+{
+  "type": "ConstitutionalCommitteeHotExtendedSigningKey_ed25519_bip32",
+  "description": "Constitutional Committee Hot Extended Signing Key",
+  "cborHex": "5880e87138d157d31374987c97c2d2b681f0f995734b70367a31ea87f8c3d382345415787fe9fc22d8363bc6826ba6ac9739225bbb6fc73f0005679a6313ef7e6b6af010c4332699c6ea1e43b427919860277169382d43d2969b28a110cfa08d955c4f178f20955541ce918a6a1352c32536f22677008f9f918d109663e4d2bdc084"
+}