From 6302a7ee4e0cc0d2a8c66fbb151024ba629f0514 Mon Sep 17 00:00:00 2001 From: Mateusz Galazyn Date: Mon, 30 Oct 2023 18:28:47 +0100 Subject: [PATCH] Remove usage of stake pool keys as credentials --- .../EraBased/Commands/Governance/Actions.hs | 21 ++++------ .../EraBased/Options/Governance/Actions.hs | 22 ++++------ .../CLI/EraBased/Run/Governance/Actions.hs | 38 ++++-------------- .../CLI/EraBased/Run/Governance/DRep.hs | 5 +-- .../CLI/EraBased/Run/Governance/Vote.hs | 40 ++++++------------- .../cardano-cli-golden/files/golden/help.cli | 35 ++++------------ ..._governance_action_create-constitution.cli | 13 +----- .../conway_governance_action_create-info.cli | 13 +----- ...governance_action_create-no-confidence.cli | 13 +----- ...tion_create-protocol-parameters-update.cli | 13 +----- ...ance_action_create-treasury-withdrawal.cli | 26 +----------- ...way_governance_action_update-committee.cli | 13 +----- 12 files changed, 49 insertions(+), 203 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs index f1940cddd6..ce152623a7 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs @@ -18,8 +18,6 @@ module Cardano.CLI.EraBased.Commands.Governance.Actions , UpdateProtocolParametersConwayOnwards(..) , UpdateProtocolParametersPreConway(..) , renderGovernanceActionCmds - - , AnyStakeIdentifier(..) ) where import Cardano.Api @@ -47,7 +45,7 @@ data GoveranceActionUpdateCommitteeCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , returnAddress :: !AnyStakeIdentifier + , returnAddress :: !(VerificationKeyOrHashOrFile StakeKey) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource , oldCommitteeVkeySource :: ![VerificationKeyOrHashOrFile CommitteeColdKey] @@ -62,7 +60,7 @@ data GovernanceActionCreateConstitutionCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , stakeCredential :: !AnyStakeIdentifier + , stakeCredential :: !(VerificationKeyOrHashOrFile StakeKey) , mPrevGovernanceActionId :: !(Maybe (TxId, Word32)) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource @@ -77,7 +75,7 @@ data GovernanceActionInfoCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , returnStakeAddress :: !AnyStakeIdentifier + , returnStakeAddress :: !(VerificationKeyOrHashOrFile StakeKey) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource , outFile :: !(File () Out) @@ -88,7 +86,7 @@ data GovernanceActionCreateNoConfidenceCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , returnStakeAddress :: !AnyStakeIdentifier + , returnStakeAddress :: !(VerificationKeyOrHashOrFile StakeKey) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource , governanceActionId :: !TxId @@ -110,10 +108,10 @@ data GovernanceActionTreasuryWithdrawalCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , returnAddr :: !AnyStakeIdentifier + , returnAddr :: !(VerificationKeyOrHashOrFile StakeKey) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource - , treasuryWithdrawal :: ![(AnyStakeIdentifier, Lovelace)] + , treasuryWithdrawal :: ![(VerificationKeyOrHashOrFile StakeKey, Lovelace)] , outFile :: !(File () Out) } deriving Show @@ -130,7 +128,7 @@ data UpdateProtocolParametersConwayOnwards era { eon :: !(ConwayEraOnwards era) , networkId :: !Ledger.Network , deposit :: !Lovelace - , returnAddr :: !AnyStakeIdentifier + , returnAddr :: !(VerificationKeyOrHashOrFile StakeKey) , proposalUrl :: !ProposalUrl , proposalHashSource :: !ProposalHashSource , governanceActionId :: !(Maybe (TxId, Word32)) @@ -170,8 +168,3 @@ renderGovernanceActionCmds = ("governance action " <>) . \case GovernanceActionViewCmd {} -> "view" - -data AnyStakeIdentifier - = AnyStakeKey (VerificationKeyOrHashOrFile StakeKey) - | AnyStakePoolKey (VerificationKeyOrHashOrFile StakePoolKey) - deriving Show diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs index f5070c12bb..4235eaa118 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -68,7 +68,7 @@ pGovernanceActionNewInfoCmd era = do Cmd.GovernanceActionInfoCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier Nothing + <*> pStakeVerificationKeyOrHashOrFile Nothing <*> pProposalUrl <*> pProposalHashSource <*> pFileOutDirection "out-file" "Path to action file to be used later on with build or build-raw " @@ -88,7 +88,7 @@ pGovernanceActionNewConstitutionCmd era = do Cmd.GovernanceActionCreateConstitutionCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier Nothing + <*> pStakeVerificationKeyOrHashOrFile Nothing <*> pPreviousGovernanceAction <*> pProposalUrl <*> pProposalHashSource @@ -118,7 +118,7 @@ pUpdateCommitteeCmd eon = Cmd.GoveranceActionUpdateCommitteeCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier Nothing + <*> pStakeVerificationKeyOrHashOrFile Nothing <*> pProposalUrl <*> pProposalHashSource <*> many pRemoveCommitteeColdVerificationKeyOrHashOrFile @@ -143,7 +143,7 @@ pGovernanceActionNoConfidenceCmd era = do Cmd.GovernanceActionCreateNoConfidenceCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier Nothing + <*> pStakeVerificationKeyOrHashOrFile Nothing <*> pProposalUrl <*> pProposalHashSource <*> pTxId "governance-action-tx-id" "Previous txid of `NoConfidence` or `NewCommittee` governance action." @@ -152,14 +152,6 @@ pGovernanceActionNoConfidenceCmd era = do ) $ Opt.progDesc "Create a no confidence proposal." --- | The first argument is the optional prefix. -pAnyStakeIdentifier :: Maybe String -> Parser Cmd.AnyStakeIdentifier -pAnyStakeIdentifier prefix = - asum - [ Cmd.AnyStakePoolKey <$> pStakePoolVerificationKeyOrHashOrFile prefix - , Cmd.AnyStakeKey <$> pStakeVerificationKeyOrHashOrFile prefix - ] - pUpdateProtocolParametersPreConway :: ShelleyToBabbageEra era -> Parser (Cmd.UpdateProtocolParametersPreConway era) pUpdateProtocolParametersPreConway shelleyToBab = Cmd.UpdateProtocolParametersPreConway shelleyToBab @@ -171,7 +163,7 @@ pUpdateProtocolParametersPostConway conwayOnwards = Cmd.UpdateProtocolParametersConwayOnwards conwayOnwards <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier Nothing + <*> pStakeVerificationKeyOrHashOrFile Nothing <*> pProposalUrl <*> pProposalHashSource <*> pPreviousGovernanceAction @@ -340,10 +332,10 @@ pGovernanceActionTreasuryWithdrawalCmd era = do Cmd.GovernanceActionTreasuryWithdrawalCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pAnyStakeIdentifier (Just "deposit-return") + <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") <*> pProposalUrl <*> pProposalHashSource - <*> many ((,) <$> pAnyStakeIdentifier (Just "funds-receiving") <*> pTransferAmt) + <*> many ((,) <$> pStakeVerificationKeyOrHashOrFile (Just "funds-receiving") <*> pTransferAmt) <*> pFileOutDirection "out-file" "Output filepath of the treasury withdrawal." ) $ Opt.progDesc "Create a treasury withdrawal." diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs index 4c64465f87..509ff8bb3d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs @@ -3,7 +3,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TupleSections #-} {-# LANGUAGE TypeFamilies #-} module Cardano.CLI.EraBased.Run.Governance.Actions @@ -12,7 +11,6 @@ module Cardano.CLI.EraBased.Run.Governance.Actions ) where import Cardano.Api -import Cardano.Api.Ledger (coerceKeyRole) import qualified Cardano.Api.Ledger as Ledger import Cardano.Api.Shelley @@ -302,18 +300,10 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do ) sbe - -readStakeKeyHash :: AnyStakeIdentifier -> ExceptT GovernanceActionsError IO (Hash StakeKey) -readStakeKeyHash anyStake = - case anyStake of - AnyStakeKey stake -> - firstExceptT GovernanceActionsCmdReadFileError - . newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stake - - AnyStakePoolKey stake -> do - StakePoolKeyHash t <- firstExceptT GovernanceActionsCmdReadFileError - . newExceptT $ readVerificationKeyOrHashOrFile AsStakePoolKey stake - return $ StakeKeyHash $ coerceKeyRole t +readStakeKeyHash :: VerificationKeyOrHashOrFile StakeKey -> ExceptT GovernanceActionsError IO (Hash StakeKey) +readStakeKeyHash stake = + firstExceptT GovernanceActionsCmdReadFileError + . newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stake runGovernanceActionTreasuryWithdrawalCmd :: () => GovernanceActionTreasuryWithdrawalCmdArgs era @@ -341,10 +331,9 @@ runGovernanceActionTreasuryWithdrawalCmd returnKeyHash <- readStakeKeyHash returnAddr - withdrawals <- sequence - [ (networkId, , ll) <$> stakeIdentifiertoCredential stakeIdentifier - | (stakeIdentifier,ll) <- treasuryWithdrawal - ] + withdrawals <- forM treasuryWithdrawal $ \(verificationKeyOrHashOrFile, lovelace) -> do + stakeKeyHash <- readStakeKeyHash verificationKeyOrHashOrFile + pure (networkId, StakeCredentialByKey stakeKeyHash, lovelace) let sbe = conwayEraOnwardsToShelleyBasedEra eon treasuryWithdrawals = TreasuryWithdrawal withdrawals @@ -353,16 +342,3 @@ runGovernanceActionTreasuryWithdrawalCmd firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon $ writeFileTextEnvelope outFile Nothing proposal - -stakeIdentifiertoCredential :: AnyStakeIdentifier -> ExceptT GovernanceActionsError IO StakeCredential -stakeIdentifiertoCredential anyStake = - case anyStake of - AnyStakeKey stake -> do - hash <- firstExceptT GovernanceActionsCmdReadFileError - . newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stake - return $ StakeCredentialByKey hash - AnyStakePoolKey stake -> do - StakePoolKeyHash t <- firstExceptT GovernanceActionsCmdReadFileError - . newExceptT $ readVerificationKeyOrHashOrFile AsStakePoolKey stake - -- TODO: Conway era - don't use coerceKeyRole - return . StakeCredentialByKey $ StakeKeyHash $ coerceKeyRole t 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 1db8c9dee8..4234c4a49c 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs @@ -113,8 +113,7 @@ runGovernanceDRepRegistrationCertificateCmd . newExceptT $ readVerificationKeyOrHashOrFile AsDRepKey drepVkeyHashSource let drepCred = Ledger.KeyHashObj $ conwayEraOnwardsConstraints w drepKeyHash - votingCredential = VotingCredential drepCred - req = DRepRegistrationRequirements w votingCredential deposit + req = DRepRegistrationRequirements w drepCred deposit registrationCert = makeDrepRegistrationCertificate req mAnchor description = Just @TextEnvelopeDescr "DRep Key Registration Certificate" @@ -138,7 +137,7 @@ runGovernanceDRepRetirementCertificateCmd DRepKeyHash drepKeyHash <- firstExceptT GovernanceCmdKeyReadError . newExceptT $ readVerificationKeyOrHashOrFile AsDRepKey vkeyHashSource - makeDrepUnregistrationCertificate (DRepUnregistrationRequirements w (VotingCredential $ KeyHashObj drepKeyHash) deposit) + makeDrepUnregistrationCertificate (DRepUnregistrationRequirements w (KeyHashObj drepKeyHash) deposit) & writeFileTextEnvelope outFile (Just genKeyDelegCertDesc) & firstExceptT GovernanceCmdTextEnvWriteError . newExceptT diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs index aae3fb6372..11bfddbddd 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs @@ -21,12 +21,10 @@ import Cardano.CLI.Types.Errors.CmdError import Cardano.CLI.Types.Errors.GovernanceVoteCmdError import Cardano.CLI.Types.Governance import Cardano.CLI.Types.Key -import Cardano.Ledger.Keys (coerceKeyRole) import Control.Monad.Trans.Except import Control.Monad.Trans.Except.Extra import Data.Aeson.Encode.Pretty -import Data.Bifunctor import Data.Function import qualified Data.Yaml.Pretty as Yaml @@ -62,39 +60,25 @@ runGovernanceVoteCreateCmd let voteAnchor = Ledger.Anchor { Ledger.anchorUrl = url, Ledger.anchorDataHash = voteHash } VotingProcedure votingProcedureWithoutAnchor = createVotingProcedure eon voteChoice Nothing votingProcedureWithAnchor = VotingProcedure $ votingProcedureWithoutAnchor { Ledger.vProcAnchor = Ledger.SJust voteAnchor } - return votingProcedureWithAnchor + pure votingProcedureWithAnchor shelleyBasedEraConstraints sbe $ do - case votingStakeCredentialSource of + voter <- firstExceptT GovernanceVoteCmdReadVerificationKeyError $ case votingStakeCredentialSource of AnyDRepVerificationKeyOrHashOrFile stake -> do - DRepKeyHash h <- firstExceptT GovernanceVoteCmdReadVerificationKeyError - . newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsDRepKey stake - let vStakeCred = StakeCredentialByKey . StakeKeyHash $ coerceKeyRole h - - votingCred <- hoistEither $ first GovernanceVoteCmdCredentialDecodeError $ toVotingCredential eon vStakeCred - let voter = Ledger.DRepVoter (unVotingCredential votingCred) - govActIdentifier = createGovernanceActionId govActionTxId govActionIndex - votingProcedures = singletonVotingProcedures eon voter govActIdentifier (unVotingProcedure voteProcedure) - firstExceptT GovernanceVoteCmdWriteError . newExceptT $ writeFileTextEnvelope outFile Nothing votingProcedures + DRepKeyHash h <- newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsDRepKey stake + pure $ Ledger.DRepVoter $ Ledger.KeyHashObj h AnyStakePoolVerificationKeyOrHashOrFile stake -> do - h <- firstExceptT GovernanceVoteCmdReadVerificationKeyError - . newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsStakePoolKey stake - - let voter = Ledger.StakePoolVoter (unStakePoolKeyHash h) - govActIdentifier = createGovernanceActionId govActionTxId govActionIndex - votingProcedures = singletonVotingProcedures eon voter govActIdentifier (unVotingProcedure voteProcedure) - firstExceptT GovernanceVoteCmdWriteError . newExceptT $ writeFileTextEnvelope outFile Nothing votingProcedures + StakePoolKeyHash h <- newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsStakePoolKey stake + pure $ Ledger.StakePoolVoter h AnyCommitteeHotVerificationKeyOrHashOrFile stake -> do - CommitteeHotKeyHash h <- firstExceptT GovernanceVoteCmdReadVerificationKeyError - . newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsCommitteeHotKey stake - let vStakeCred = StakeCredentialByKey . StakeKeyHash $ coerceKeyRole h - votingCred <- hoistEither $ first GovernanceVoteCmdCredentialDecodeError $ toVotingCredential eon vStakeCred - let voter = Ledger.CommitteeVoter (Ledger.coerceKeyRole (unVotingCredential votingCred)) -- TODO Conway - remove coerceKeyRole - govActIdentifier = createGovernanceActionId govActionTxId govActionIndex - votingProcedures = singletonVotingProcedures eon voter govActIdentifier (unVotingProcedure voteProcedure) - firstExceptT GovernanceVoteCmdWriteError . newExceptT $ writeFileTextEnvelope outFile Nothing votingProcedures + CommitteeHotKeyHash h <- newExceptT $ readVerificationKeyOrHashOrTextEnvFile AsCommitteeHotKey stake + pure $ Ledger.CommitteeVoter $ Ledger.KeyHashObj h + + let govActIdentifier = createGovernanceActionId govActionTxId govActionIndex + votingProcedures = singletonVotingProcedures eon voter govActIdentifier (unVotingProcedure voteProcedure) + firstExceptT GovernanceVoteCmdWriteError . newExceptT $ writeFileTextEnvelope outFile Nothing votingProcedures runGovernanceVoteViewCmd :: () => Cmd.GovernanceVoteViewCmdArgs era diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli index a763e0f662..b2375e1074 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -5915,10 +5915,7 @@ Usage: cardano-cli conway governance action create-constitution | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -5943,10 +5940,7 @@ Usage: cardano-cli conway governance action update-committee | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -5974,10 +5968,7 @@ Usage: cardano-cli conway governance action update-committee Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -5995,10 +5986,7 @@ Usage: cardano-cli conway governance action create-no-confidence | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -6018,10 +6006,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -6084,10 +6069,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal | --testnet ) --governance-action-deposit NATURAL - ( --deposit-return-stake-pool-verification-key STRING - | --deposit-return-cold-verification-key-file FILE - | --deposit-return-stake-pool-id STAKE_POOL_ID - | --deposit-return-stake-verification-key STRING + ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH ) @@ -6097,10 +6079,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal | --proposal-anchor-metadata-hash HASH ) [ - ( --funds-receiving-stake-pool-verification-key STRING - | --funds-receiving-cold-verification-key-file FILE - | --funds-receiving-stake-pool-id STAKE_POOL_ID - | --funds-receiving-stake-verification-key STRING + ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILE | --funds-receiving-stake-key-hash HASH ) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli index b6d602f07f..a9dd22e4f0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-constitution.cli @@ -3,10 +3,7 @@ Usage: cardano-cli conway governance action create-constitution | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -31,14 +28,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli index 307bf1f5eb..d9b20e1019 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-info.cli @@ -1,9 +1,6 @@ Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -21,14 +18,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli index 2531d8a3f2..0e2e456eb4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-no-confidence.cli @@ -3,10 +3,7 @@ Usage: cardano-cli conway governance action create-no-confidence | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -26,14 +23,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli index a833646b87..83b31c4446 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-protocol-parameters-update.cli @@ -3,10 +3,7 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -69,14 +66,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli index 7a42d97aba..0542b7420b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_create-treasury-withdrawal.cli @@ -3,10 +3,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal | --testnet ) --governance-action-deposit NATURAL - ( --deposit-return-stake-pool-verification-key STRING - | --deposit-return-cold-verification-key-file FILE - | --deposit-return-stake-pool-id STAKE_POOL_ID - | --deposit-return-stake-verification-key STRING + ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH ) @@ -16,10 +13,7 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal | --proposal-anchor-metadata-hash HASH ) [ - ( --funds-receiving-stake-pool-verification-key STRING - | --funds-receiving-cold-verification-key-file FILE - | --funds-receiving-stake-pool-id STAKE_POOL_ID - | --funds-receiving-stake-verification-key STRING + ( --funds-receiving-stake-verification-key STRING | --funds-receiving-stake-verification-key-file FILE | --funds-receiving-stake-key-hash HASH ) @@ -33,14 +27,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --deposit-return-stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --deposit-return-cold-verification-key-file FILE - Filepath of the stake pool verification key. - --deposit-return-stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --deposit-return-stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --deposit-return-stake-verification-key-file FILE @@ -55,14 +41,6 @@ Available options: Proposal anchor contents as a text file. --proposal-anchor-metadata-hash HASH Proposal anchor data hash. - --funds-receiving-stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --funds-receiving-cold-verification-key-file FILE - Filepath of the stake pool verification key. - --funds-receiving-stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --funds-receiving-stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --funds-receiving-stake-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli index 71e87b3b25..a880250f8c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_action_update-committee.cli @@ -3,10 +3,7 @@ Usage: cardano-cli conway governance action update-committee | --testnet ) --governance-action-deposit NATURAL - ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - | --stake-pool-id STAKE_POOL_ID - | --stake-verification-key STRING + ( --stake-verification-key STRING | --stake-verification-key-file FILE | --stake-key-hash HASH ) @@ -37,14 +34,6 @@ Available options: --testnet Use the testnet magic id. --governance-action-deposit NATURAL Deposit required to submit a governance action. - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --stake-pool-id STAKE_POOL_ID - Stake pool ID/verification key hash (either - Bech32-encoded or hex-encoded). Zero or more - occurences of this option is allowed. --stake-verification-key STRING Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE