Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands. #658

carbolymer · 2024-03-18T19:50:45Z

Changelog

- description: |
    Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands.
# uncomment types applicable to the change:
  type:
   - feature        # introduces a new feature
  # - breaking       # the API has changed in a breaking way
  # - compatible     # the API has changed but is non-breaking
  # - optimisation   # measurable performance improvements
   - improvement    # QoL changes e.g. refactoring
  # - bugfix         # fixes a defect
  # - test           # fixes/modifies tests
  # - maintenance    # not directly related to the code
  # - release        # related to a new release preparation
  # - documentation  # change in code docs, haddocks...

Context

This PR consists of two commits:

Refactoring extending use of MonadTransIOError
Implementation of plutus script hash in update-committee.

It is better to review this PR commit-by-commit.

Requires changes from the following PR to compile successfully:

Add support for script-based CC members cardano-api#489

Checklist

Commit sequence broadly makes sense and commits have useful messages
New tests are added if needed and existing tests are updated. See Running tests for more details
Self-reviewed the diff

...-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli

smelc · 2024-03-19T09:29:35Z

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

-          stakeVKeyHash <- firstExceptT AddressCmdReadKeyFileError $
-            newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stkVkeyOrFile
-
+          stakeVKeyHash <- modifyError AddressCmdReadKeyFileError $


Nice 👍 I've always found those firstExcepT _ $ newExceptT a bit clunky.

cardano-cli/src/Cardano/CLI/Types/Key.hs

smelc · 2024-03-19T19:52:20Z

cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Committee.hs

+      { Cmd.eon
+      , Cmd.vkeyColdKeySource
+      , Cmd.anchor
+      , Cmd.outFile


Nice usage of punning to reduce noise 👍

CarlosLopezDeLara

Tested both the governance action and the resignation certificate. Both work as expected!

smelc · 2024-03-20T13:24:15Z

cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs

@@ -686,11 +690,26 @@ pAddCommitteeColdVerificationKeyFile =
    ]

 ---
-pRemoveCommitteeColdVerificationKeyOrHashOrFile :: Parser (VerificationKeyOrHashOrFile CommitteeColdKey)
+pRemoveCommitteeColdVerificationKeyOrHashOrFile :: Parser (VerificationKeyOrHashOrFileOrScriptHash CommitteeColdKey)


If being nitpicky, this function should be named pRemoveCommitteeColdVerificationKeyOrHashOrFileOrScriptHash (note the additional suffix).

But probably this is overkill, since this is also indicated in the return type. So maybe just rename to pRemoveCommitteeColdVerificationKeySource?

The same remark applies to pAddCommitteeColdVerificationKeyOrHashOrFile.

Thanks, that's a good idea. I think we can go with source since it's a single-use parser and it would define what's happening in an unique way.

…ey... types

Co-authored-by: Clément Hurlin <[email protected]>

palas

Thanks, code looks much neater now. Just a couple of lints

cardano-cli/src/Cardano/CLI/Types/Key.hs

Co-authored-by: Pablo Lamela <[email protected]>

Jimbo4350

👍

carbolymer linked an issue Mar 18, 2024 that may be closed by this pull request

[FEATURE] - update-committee to accept scripthash for both add and remove CC #656

Closed

17 tasks

carbolymer mentioned this pull request Mar 18, 2024

Add support for script-based CC members IntersectMBO/cardano-api#489

Merged

3 tasks

carbolymer commented Mar 18, 2024

View reviewed changes

...-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli Outdated Show resolved Hide resolved

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from 50f710a to c4d4a94 Compare March 18, 2024 21:06

carbolymer marked this pull request as ready for review March 18, 2024 21:06

carbolymer requested review from Jimbo4350, newhoggy, kevinhammond and disassembler as code owners March 18, 2024 21:06

carbolymer requested review from smelc, palas and CarlosLopezDeLara March 18, 2024 21:07

smelc reviewed Mar 19, 2024

View reviewed changes

smelc approved these changes Mar 19, 2024

View reviewed changes

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from c4d4a94 to 4f423d5 Compare March 19, 2024 12:09

github-advanced-security bot found potential problems Mar 19, 2024

View reviewed changes

cardano-cli/src/Cardano/CLI/Types/Key.hs Fixed Show fixed Hide fixed

cardano-cli/src/Cardano/CLI/Types/Key.hs Fixed Show fixed Hide fixed

carbolymer marked this pull request as draft March 19, 2024 13:36

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch 4 times, most recently from 7d65f7d to df8c56a Compare March 19, 2024 16:43

carbolymer marked this pull request as ready for review March 19, 2024 16:43

carbolymer linked an issue Mar 19, 2024 that may be closed by this pull request

[FEATURE] - CC resignation certificate script based CC member #657

Closed

18 tasks

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from ada9409 to e0bdbcf Compare March 19, 2024 17:10

smelc reviewed Mar 19, 2024

View reviewed changes

cardano-cli/src/Cardano/CLI/Types/Key.hs Outdated Show resolved Hide resolved

cardano-cli/src/Cardano/CLI/Types/Key.hs Outdated Show resolved Hide resolved

smelc reviewed Mar 19, 2024

View reviewed changes

smelc approved these changes Mar 19, 2024

View reviewed changes

CarlosLopezDeLara approved these changes Mar 19, 2024

View reviewed changes

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from 52ec0c1 to 5a2bd72 Compare March 20, 2024 11:05

smelc reviewed Mar 20, 2024

View reviewed changes

carbolymer linked an issue Mar 20, 2024 that may be closed by this pull request

Expand query committee-state to allow query by scripthash #663

Closed

carbolymer and others added 6 commits March 20, 2024 15:36

Update to cardano-api 8.42.0.0

32d54ec

Refactor: use MonadIOTransError for functions accepting VerificationK…

1eaeafc

…ey... types

Add plutus script hash support for update-committee

94844e5

Use plutus script hash instead of plutus script for update-committee

6c5f522

Co-authored-by: Clément Hurlin <[email protected]>

#657 Add resignation certificate script-based CC member

e5d9504

#663 Expand query committee-state to allow query by scripthash

0d1ae97

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from 80e8f4b to 3f8ed28 Compare March 20, 2024 14:41

smelc mentioned this pull request Mar 20, 2024

vote create: support DRep and CC script hash #665

Merged

2 tasks

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch 2 times, most recently from fabae22 to 5b66907 Compare March 20, 2024 16:25

palas approved these changes Mar 20, 2024

View reviewed changes

cardano-cli/src/Cardano/CLI/Types/Key.hs Outdated Show resolved Hide resolved

cardano-cli/src/Cardano/CLI/Types/Key.hs Outdated Show resolved Hide resolved

cardano-cli/src/Cardano/CLI/Types/Key.hs Outdated Show resolved Hide resolved

carbolymer and others added 2 commits March 20, 2024 18:58

Refactor: rename pAddCommitteeColdVerificationKeyOrHashOrFile parser

e15aa5e

Co-authored-by: Pablo Lamela <[email protected]>

Add allow-newer for cardano-git-rev

cdf58a7

carbolymer force-pushed the mgalazyn/feature/script-support-in-update-committe branch from f87ae78 to cdf58a7 Compare March 20, 2024 18:01

carbolymer enabled auto-merge March 20, 2024 18:02

carbolymer added this pull request to the merge queue Mar 20, 2024

Merged via the queue into main with commit 372aa48 Mar 20, 2024
18 checks passed

carbolymer deleted the mgalazyn/feature/script-support-in-update-committe branch March 20, 2024 18:58

carbolymer changed the title ~~Add plutus script hash support for update-committee~~ Add Plutus script hash support in update-committee, overnance committee create-cold-key-resignation-certificate and query committee-state commands. Mar 26, 2024

Jimbo4350 reviewed Mar 27, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands. #658

Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands. #658

carbolymer commented Mar 18, 2024 •

edited

Loading

smelc Mar 19, 2024

smelc Mar 19, 2024

CarlosLopezDeLara left a comment

smelc Mar 20, 2024

carbolymer Mar 20, 2024 •

edited

Loading

palas left a comment •

edited

Loading

Jimbo4350 left a comment

Add Plutus script hash support in update-committee, overnance committee create-cold-key-resignation-certificate and query committee-state commands. #658

Add Plutus script hash support in update-committee, overnance committee create-cold-key-resignation-certificate and query committee-state commands. #658

Conversation

carbolymer commented Mar 18, 2024 • edited Loading

Changelog

Context

Checklist

smelc Mar 19, 2024

Choose a reason for hiding this comment

smelc Mar 19, 2024

Choose a reason for hiding this comment

CarlosLopezDeLara left a comment

Choose a reason for hiding this comment

smelc Mar 20, 2024

Choose a reason for hiding this comment

carbolymer Mar 20, 2024 • edited Loading

Choose a reason for hiding this comment

palas left a comment • edited Loading

Choose a reason for hiding this comment

Jimbo4350 left a comment

Choose a reason for hiding this comment

Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands. #658

Add Plutus script hash support in `update-committee`, `overnance committee create-cold-key-resignation-certificate` and `query committee-state` commands. #658

carbolymer commented Mar 18, 2024 •

edited

Loading

carbolymer Mar 20, 2024 •

edited

Loading

palas left a comment •

edited

Loading