diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs index fe4886dc56..c008005be8 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/DRep.hs @@ -24,7 +24,9 @@ data GovernanceDRepCmds era IdOutputFormat (Maybe (File () Out)) | GovernanceDRepRegistrationCertificateCmd - AnyRegistrationTarget + (ConwayEraOnwards era) + (VerificationKeyOrHashOrFile DRepKey) + Lovelace (File () Out) renderGovernanceDRepCmds :: () diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs index 25454a86ec..2014204e37 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs @@ -38,7 +38,7 @@ pGovernanceCmds era envCli = , fmap GovernanceQueryCmds <$> pGovernanceQueryCmds era envCli , fmap GovernanceActionCmds <$> pGovernanceActionCmds era , fmap GovernanceCommitteeCmds <$> pGovernanceCommitteeCmds era - , fmap GovernanceDRepCmds <$> pGovernanceDRepCmds era envCli + , fmap GovernanceDRepCmds <$> pGovernanceDRepCmds era , fmap GovernanceVoteCmds <$> pGovernanceVoteCmds era ] diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs index 3eb4734b2e..f238e5732a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs @@ -25,9 +25,8 @@ import qualified Options.Applicative as Opt pGovernanceDRepCmds :: () => CardanoEra era - -> EnvCli -> Maybe (Parser (GovernanceDRepCmds era)) -pGovernanceDRepCmds era envCli = +pGovernanceDRepCmds era = subInfoParser "drep" ( Opt.progDesc $ mconcat @@ -36,7 +35,7 @@ pGovernanceDRepCmds era envCli = ) [ pGovernanceDRepKeyGenCmd era , pGovernanceDRepKeyIdCmd era - , pRegistrationCertificateCmd era envCli + , pRegistrationCertificateCmd era ] pGovernanceDRepKeyGenCmd :: () @@ -84,37 +83,17 @@ pDRepIdOutputFormat = pRegistrationCertificateCmd :: () => CardanoEra era - -> EnvCli -> Maybe (Parser (GovernanceDRepCmds era)) -pRegistrationCertificateCmd era envCli = do +pRegistrationCertificateCmd era = do w <- maybeEonInEra era pure $ subParser "registration-certificate" - $ Opt.info (pEraCmd envCli w) + $ Opt.info (mkParser w) $ Opt.progDesc "Create a registration certificate." where - pEraCmd :: EnvCli -> AnyEraDecider era -> Parser (GovernanceDRepCmds era) - pEraCmd envCli' = \case - AnyEraDeciderShelleyToBabbage sToB -> - GovernanceDRepRegistrationCertificateCmd - <$> asum [ ShelleyToBabbageStakePoolRegTarget sToB - <$> pStakePoolRegistrationParserRequirements envCli' - , ShelleyToBabbageStakeKeyRegTarget sToB - <$> pStakeIdentifier - ] - <*> pOutputFile - - AnyEraDeciderConwayOnwards cOn -> - GovernanceDRepRegistrationCertificateCmd . ConwayOnwardRegTarget cOn - <$> asum [ RegisterStakePool cOn - <$> pStakePoolRegistrationParserRequirements envCli' - , RegisterStakeKey cOn - <$> pStakeIdentifier - <*> pKeyRegistDeposit - , RegisterDRep cOn - <$> pDRepVerificationKeyOrHashOrFile - <*> pKeyRegistDeposit - ] + mkParser w = GovernanceDRepRegistrationCertificateCmd w + <$> pDRepVerificationKeyOrHashOrFile + <*> pKeyRegistDeposit <*> 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 index e45842ea95..7ca8c9476d 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/DRep.hs @@ -17,7 +17,6 @@ import Cardano.Api.Shelley import Cardano.CLI.EraBased.Commands.Governance.DRep import Cardano.CLI.EraBased.Run.Governance -import Cardano.CLI.Read import Cardano.CLI.Types.Common import Cardano.CLI.Types.Errors.CmdError import Cardano.CLI.Types.Errors.GovernanceCmdError @@ -42,8 +41,8 @@ runGovernanceDRepCmds = \case runGovernanceDRepIdCmd w vkey idOutputFormat mOutFp & firstExceptT CmdGovernanceCmdError - GovernanceDRepRegistrationCertificateCmd regTarget outFp -> - runGovernanceRegistrationCertificateCmd regTarget outFp + GovernanceDRepRegistrationCertificateCmd w vkey lovelace outFp -> + runGovernanceRegistrationCertificateCmd w vkey lovelace outFp & firstExceptT CmdRegistrationError runGovernanceDRepIdCmd :: () @@ -70,153 +69,23 @@ runGovernanceDRepIdCmd _ vkOrFp idOutputFormat mOutFile = do -- Registration Certificate related runGovernanceRegistrationCertificateCmd - :: AnyRegistrationTarget + :: ConwayEraOnwards era + -> VerificationKeyOrHashOrFile DRepKey + -> Lovelace -> File () Out -> ExceptT RegistrationError IO () -runGovernanceRegistrationCertificateCmd anyReg outfp = - case anyReg of - ShelleyToBabbageStakePoolRegTarget stoB regReqs -> do - -- Pool verification key - stakePoolVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsStakePoolKey $ sprStakePoolKey regReqs - let stakePoolId' = verificationKeyHash stakePoolVerKey - - -- VRF verification key - vrfVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsVrfKey $ sprVrfKey regReqs - let vrfKeyHash' = verificationKeyHash vrfVerKey - - -- Pool reward account - rwdStakeVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsStakeKey $ sprRewardAccountKey regReqs - let stakeCred = StakeCredentialByKey (verificationKeyHash rwdStakeVerKey) - rewardAccountAddr = makeStakeAddress (sprNetworkId regReqs) stakeCred - - -- Pool owner(s) - sPoolOwnerVkeys <- - mapM - (firstExceptT RegistrationReadError - . newExceptT - . readVerificationKeyOrFile AsStakeKey - ) - (spoPoolOwnerKeys regReqs) - let stakePoolOwners' = map verificationKeyHash sPoolOwnerVkeys - - let stakePoolParams = - StakePoolParameters - { stakePoolId = stakePoolId' - , stakePoolVRF = vrfKeyHash' - , stakePoolCost = sprPoolCost regReqs - , stakePoolMargin = sprPoolMargin regReqs - , stakePoolRewardAccount = rewardAccountAddr - , stakePoolPledge = sprPoolPledge regReqs - , stakePoolOwners = stakePoolOwners' - , stakePoolRelays = sprRelays regReqs - , stakePoolMetadata = sprMetadata regReqs - } - - let ledgerStakePoolParams = toShelleyPoolParams stakePoolParams - req = StakePoolRegistrationRequirementsPreConway stoB $ shelleyToBabbageEraConstraints stoB ledgerStakePoolParams - registrationCert = makeStakePoolRegistrationCertificate req - description = Just @TextEnvelopeDescr "Stake Pool Registration Certificate" - firstExceptT RegistrationWriteFileError - . newExceptT - . writeLazyByteStringFile outfp - $ shelleyToBabbageEraConstraints stoB - $ textEnvelopeToJSON description registrationCert - - ShelleyToBabbageStakeKeyRegTarget sToB stakeIdentifier -> do - stakeCred <- - getStakeCredentialFromIdentifier stakeIdentifier - & firstExceptT RegistrationStakeCredentialError - let req = StakeAddrRegistrationPreConway sToB stakeCred - registrationCert = makeStakeAddressRegistrationCertificate req - description = Just @TextEnvelopeDescr "Stake Key Registration Certificate" - firstExceptT RegistrationWriteFileError - . newExceptT - . writeLazyByteStringFile outfp - $ shelleyToBabbageEraConstraints sToB - $ textEnvelopeToJSON description registrationCert - - ConwayOnwardRegTarget _ regTarget -> - case regTarget of - RegisterStakePool cOnwards regReqs -> do - -- Pool verification key - stakePoolVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsStakePoolKey $ sprStakePoolKey regReqs - let stakePoolId' = verificationKeyHash stakePoolVerKey - -- VRF verification key - vrfVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsVrfKey $ sprVrfKey regReqs - let vrfKeyHash' = verificationKeyHash vrfVerKey - -- Pool reward account - rwdStakeVerKey <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrFile AsStakeKey $ sprRewardAccountKey regReqs - let stakeCred = StakeCredentialByKey (verificationKeyHash rwdStakeVerKey) - rewardAccountAddr = makeStakeAddress (sprNetworkId regReqs) stakeCred - -- Pool owner(s) - sPoolOwnerVkeys <- - mapM - (firstExceptT RegistrationReadError - . newExceptT - . readVerificationKeyOrFile AsStakeKey - ) - (spoPoolOwnerKeys regReqs) - let stakePoolOwners' = map verificationKeyHash sPoolOwnerVkeys - - let stakePoolParams = - StakePoolParameters - { stakePoolId = stakePoolId' - , stakePoolVRF = vrfKeyHash' - , stakePoolCost = sprPoolCost regReqs - , stakePoolMargin = sprPoolMargin regReqs - , stakePoolRewardAccount = rewardAccountAddr - , stakePoolPledge = sprPoolPledge regReqs - , stakePoolOwners = stakePoolOwners' - , stakePoolRelays = sprRelays regReqs - , stakePoolMetadata = sprMetadata regReqs - } - - let ledgerStakePoolParams = toShelleyPoolParams stakePoolParams - req = StakePoolRegistrationRequirementsConwayOnwards cOnwards - $ conwayEraOnwardsConstraints cOnwards ledgerStakePoolParams - registrationCert = makeStakePoolRegistrationCertificate req - description = Just @TextEnvelopeDescr "Stake Pool Registration Certificate" - firstExceptT RegistrationWriteFileError - . newExceptT - . writeLazyByteStringFile outfp - $ conwayEraOnwardsConstraints cOnwards - $ textEnvelopeToJSON description registrationCert - RegisterStakeKey cOnwards sIdentifier deposit -> do - stakeCred <- - getStakeCredentialFromIdentifier sIdentifier - & firstExceptT RegistrationStakeCredentialError - let req = StakeAddrRegistrationConway cOnwards deposit stakeCred - registrationCert = makeStakeAddressRegistrationCertificate req - description = Just @TextEnvelopeDescr "Stake Key Registration Certificate" - firstExceptT RegistrationWriteFileError - . newExceptT - . writeLazyByteStringFile outfp - $ conwayEraOnwardsConstraints cOnwards - $ textEnvelopeToJSON description registrationCert - RegisterDRep cOnwards drepVKey deposit -> do - DRepKeyHash drepKeyHash <- firstExceptT RegistrationReadError - . newExceptT - $ readVerificationKeyOrHashOrFile AsDRepKey drepVKey - let drepCred = Ledger.KeyHashObj $ conwayEraOnwardsConstraints cOnwards drepKeyHash - votingCredential = VotingCredential drepCred - req = DRepRegistrationRequirements cOnwards votingCredential deposit - registrationCert = makeDrepRegistrationCertificate req - description = Just @TextEnvelopeDescr "DRep Key Registration Certificate" - - firstExceptT RegistrationWriteFileError - . newExceptT - . writeLazyByteStringFile outfp - $ conwayEraOnwardsConstraints cOnwards - $ textEnvelopeToJSON description registrationCert +runGovernanceRegistrationCertificateCmd cOnwards drepKOrHOrF deposit outfp = do + DRepKeyHash drepKeyHash <- firstExceptT RegistrationReadError + . newExceptT + $ readVerificationKeyOrHashOrFile AsDRepKey drepKOrHOrF + let drepCred = Ledger.KeyHashObj $ conwayEraOnwardsConstraints cOnwards drepKeyHash + votingCredential = VotingCredential drepCred + req = DRepRegistrationRequirements cOnwards votingCredential deposit + registrationCert = makeDrepRegistrationCertificate req + description = Just @TextEnvelopeDescr "DRep Key Registration Certificate" + + firstExceptT RegistrationWriteFileError + . newExceptT + . writeLazyByteStringFile outfp + $ conwayEraOnwardsConstraints cOnwards + $ textEnvelopeToJSON description registrationCert diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs index 7c3bcc1473..ad2b432da7 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Key.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Key.hs @@ -35,9 +35,6 @@ module Cardano.CLI.Types.Key , AnyDelegationTarget(..) , StakeTarget (..) - , AnyRegistrationTarget(..) - , RegistrationTarget(..) - , ColdVerificationKeyOrFile(..) , DRepHashSource(..) @@ -138,23 +135,6 @@ data StakeIdentifier | StakeIdentifierAddress StakeAddress deriving (Eq, Show) - -data AnyRegistrationTarget where - ShelleyToBabbageStakePoolRegTarget - :: ShelleyToBabbageEra era - -> StakePoolRegistrationParserRequirements - -> AnyRegistrationTarget - - ShelleyToBabbageStakeKeyRegTarget - :: ShelleyToBabbageEra era - -> StakeIdentifier - -> AnyRegistrationTarget - - ConwayOnwardRegTarget - :: ConwayEraOnwards era - -> RegistrationTarget era - -> AnyRegistrationTarget - data StakePoolRegistrationParserRequirements = StakePoolRegistrationParserRequirements { sprStakePoolKey :: VerificationKeyOrFile StakePoolKey @@ -179,24 +159,6 @@ data StakePoolRegistrationParserRequirements } -data RegistrationTarget era where - RegisterStakePool - :: ConwayEraOnwards era - -> StakePoolRegistrationParserRequirements - -> RegistrationTarget era - - RegisterStakeKey - :: ConwayEraOnwards era - -> StakeIdentifier - -> Lovelace - -> RegistrationTarget era - - RegisterDRep - :: ConwayEraOnwards era - -> VerificationKeyOrHashOrFile DRepKey - -> Lovelace - -> RegistrationTarget era - -- | A resource that identifies the delegation target. We can delegate -- our stake for two reasons: -- 1. To gain rewards. This is limited to choosing a stake pool 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 2baf84196c..7d42c087c1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -262,7 +262,7 @@ Usage: cardano-cli shelley genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli shelley governance (create-mir-certificate | action | drep) +Usage: cardano-cli shelley governance (create-mir-certificate | action) Governance commands. @@ -332,47 +332,6 @@ Usage: cardano-cli shelley governance action create-protocol-parameters-update - Create a protocol parameters update. -Usage: cardano-cli shelley governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli shelley governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli shelley node ( key-gen | key-gen-KES @@ -1486,7 +1445,7 @@ Usage: cardano-cli allegra genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli allegra governance (create-mir-certificate | action | drep) +Usage: cardano-cli allegra governance (create-mir-certificate | action) Governance commands. @@ -1556,47 +1515,6 @@ Usage: cardano-cli allegra governance action create-protocol-parameters-update - Create a protocol parameters update. -Usage: cardano-cli allegra governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli allegra governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli allegra node ( key-gen | key-gen-KES @@ -2708,7 +2626,7 @@ Usage: cardano-cli mary genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli mary governance (create-mir-certificate | action | drep) +Usage: cardano-cli mary governance (create-mir-certificate | action) Governance commands. @@ -2778,47 +2696,6 @@ Usage: cardano-cli mary governance action create-protocol-parameters-update --ep Create a protocol parameters update. -Usage: cardano-cli mary governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli mary governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli mary node ( key-gen | key-gen-KES @@ -3904,7 +3781,7 @@ Usage: cardano-cli alonzo genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli alonzo governance (create-mir-certificate | action | drep) +Usage: cardano-cli alonzo governance (create-mir-certificate | action) Governance commands. @@ -3981,47 +3858,6 @@ Usage: cardano-cli alonzo governance action create-protocol-parameters-update -- Create a protocol parameters update. -Usage: cardano-cli alonzo governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli alonzo governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli alonzo node ( key-gen | key-gen-KES @@ -5134,7 +4970,7 @@ Usage: cardano-cli babbage genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli babbage governance (create-mir-certificate | action | drep) +Usage: cardano-cli babbage governance (create-mir-certificate | action) Governance commands. @@ -5207,47 +5043,6 @@ Usage: cardano-cli babbage governance action create-protocol-parameters-update - Create a protocol parameters update. -Usage: cardano-cli babbage governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli babbage governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli babbage node ( key-gen | key-gen-KES @@ -6701,45 +6496,11 @@ Usage: cardano-cli conway governance drep id Generate a drep id. Usage: cardano-cli conway governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | ( --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --key-reg-deposit-amt NATURAL - | ( --drep-verification-key STRING - | --drep-verification-key-file FILE - | --drep-key-hash HASH - ) - --key-reg-deposit-amt NATURAL + ( --drep-verification-key STRING + | --drep-verification-key-file FILE + | --drep-key-hash HASH ) + --key-reg-deposit-amt NATURAL --out-file FILE Create a registration certificate. @@ -7914,7 +7675,7 @@ Usage: cardano-cli latest genesis hash --genesis FILE Compute the hash of a genesis file -Usage: cardano-cli latest governance (create-mir-certificate | action | drep) +Usage: cardano-cli latest governance (create-mir-certificate | action) Governance commands. @@ -7987,47 +7748,6 @@ Usage: cardano-cli latest governance action create-protocol-parameters-update -- Create a protocol parameters update. -Usage: cardano-cli latest governance drep registration-certificate - - DRep member commands. - -Usage: cardano-cli latest governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - Usage: cardano-cli latest node ( key-gen | key-gen-KES diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance.cli index 244ab7ddf1..a559ae7fad 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli allegra governance (create-mir-certificate | action | drep) +Usage: cardano-cli allegra governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance.cli index f48284620c..7049ebea89 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli alonzo governance (create-mir-certificate | action | drep) +Usage: cardano-cli alonzo governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance.cli index 161b28db5a..c46b2145a0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli babbage governance (create-mir-certificate | action | drep) +Usage: cardano-cli babbage governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli index 826a80f373..cc32c49b43 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_governance_drep_registration-certificate.cli @@ -1,94 +1,14 @@ Usage: cardano-cli conway governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | ( --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --key-reg-deposit-amt NATURAL - | ( --drep-verification-key STRING - | --drep-verification-key-file FILE - | --drep-key-hash HASH - ) - --key-reg-deposit-amt NATURAL + ( --drep-verification-key STRING + | --drep-verification-key-file FILE + | --drep-key-hash HASH ) + --key-reg-deposit-amt NATURAL --out-file FILE Create a registration certificate. Available options: - --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. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --key-reg-deposit-amt NATURAL - Key registration deposit amount. --drep-verification-key STRING DRep verification key (Bech32 or hex-encoded). --drep-verification-key-file FILE diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance.cli index 8fe05e68da..4e78e466fa 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli latest governance (create-mir-certificate | action | drep) +Usage: cardano-cli latest governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance.cli index e633836e37..672f157679 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli mary governance (create-mir-certificate | action | drep) +Usage: cardano-cli mary governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance.cli index f1993128c8..926f6ac6fd 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance.cli @@ -1,4 +1,4 @@ -Usage: cardano-cli shelley governance (create-mir-certificate | action | drep) +Usage: cardano-cli shelley governance (create-mir-certificate | action) Governance commands. @@ -9,4 +9,3 @@ Available commands: create-mir-certificate Create an MIR (Move Instantaneous Rewards) certificate action Governance action commands. - drep DRep member commands.