diff --git a/.github/workflows/check-stylish-haskell.yml b/.github/workflows/check-stylish-haskell.yml index 1bb61a9ee7..31642bb081 100644 --- a/.github/workflows/check-stylish-haskell.yml +++ b/.github/workflows/check-stylish-haskell.yml @@ -27,7 +27,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2023-07-28" + CABAL_CACHE_VERSION: "2024-02-23" STYLISH_HASKELL_VERSION: "0.14.4.0" diff --git a/.github/workflows/github-page.yml b/.github/workflows/github-page.yml index 1fc78f0f82..25ec4cf1ce 100644 --- a/.github/workflows/github-page.yml +++ b/.github/workflows/github-page.yml @@ -22,7 +22,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2023-12-12" + CABAL_CACHE_VERSION: "2024-02-23" concurrency: group: > diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 65e26672de..a22debd0eb 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -24,7 +24,7 @@ jobs: env: # Modify this value to "invalidate" the cabal cache. - CABAL_CACHE_VERSION: "2024-02-23-3" + CABAL_CACHE_VERSION: "2024-02-23-4" concurrency: group: > diff --git a/cabal.project b/cabal.project index 358475004e..da1696f953 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-02-23T02:09:28Z - , cardano-haskell-packages 2024-02-22T17:04:08Z + , cardano-haskell-packages 2024-02-23T11:16:54Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index bff4c5c591..19fc0444ab 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -196,7 +196,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.39.0.0 + , cardano-api ^>= 8.39.1.0 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 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 b1409de9e7..a4bc37654b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Governance/Actions.hs @@ -46,7 +46,7 @@ data GoveranceActionUpdateCommitteeCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , returnAddress :: !(VerificationKeyOrHashOrFile StakeKey) + , returnAddress :: !StakeIdentifier , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , oldCommitteeVkeySource :: ![VerificationKeyOrHashOrFile CommitteeColdKey] @@ -61,12 +61,13 @@ data GovernanceActionCreateConstitutionCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , stakeCredential :: !(VerificationKeyOrHashOrFile StakeKey) + , stakeCredential :: !StakeIdentifier , mPrevGovernanceActionId :: !(Maybe (TxId, Word32)) , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , constitutionUrl :: !ConstitutionUrl , constitutionHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) + , constitutionScript :: !(Maybe ScriptHash) , outFile :: !(File () Out) } deriving Show @@ -76,7 +77,7 @@ data GovernanceActionInfoCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , returnStakeAddress :: !(VerificationKeyOrHashOrFile StakeKey) + , returnStakeAddress :: !StakeIdentifier , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , outFile :: !(File () Out) @@ -87,7 +88,7 @@ data GovernanceActionCreateNoConfidenceCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , returnStakeAddress :: !(VerificationKeyOrHashOrFile StakeKey) + , returnStakeAddress :: !StakeIdentifier , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , governanceActionId :: !TxId @@ -117,7 +118,7 @@ data GovernanceActionTreasuryWithdrawalCmdArgs era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , returnAddr :: !(VerificationKeyOrHashOrFile StakeKey) + , returnAddr :: !StakeIdentifier , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , treasuryWithdrawal :: ![(VerificationKeyOrHashOrFile StakeKey, Lovelace)] @@ -138,7 +139,7 @@ data UpdateProtocolParametersConwayOnwards era { eon :: !(ConwayEraOnwards era) , networkId :: !L.Network , deposit :: !Lovelace - , returnAddr :: !(VerificationKeyOrHashOrFile StakeKey) + , returnAddr :: !StakeIdentifier , proposalUrl :: !ProposalUrl , proposalHash :: !(L.SafeHash L.StandardCrypto L.AnchorData) , governanceActionId :: !(Maybe (TxId, Word32)) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs index c4922732fe..da23388d97 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Address.hs @@ -63,7 +63,7 @@ pAddressBuild :: EnvCli -> Parser (AddressCmds era) pAddressBuild envCli = AddressBuild <$> pPaymentVerifier - <*> Opt.optional pStakeIdentifier + <*> Opt.optional (pStakeIdentifier Nothing) <*> pNetworkId envCli <*> pMaybeOutputFile diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 141365e526..cc172d1504 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -206,22 +206,22 @@ decimal :: Parsec.Parser Integer Parsec.TokenParser { Parsec.decimal = decimal } = Parsec.haskell -pStakeIdentifier :: Parser StakeIdentifier -pStakeIdentifier = asum - [ StakeIdentifierVerifier <$> pStakeVerifier - , StakeIdentifierAddress <$> pStakeAddress +pStakeIdentifier :: Maybe String -> Parser StakeIdentifier +pStakeIdentifier prefix = asum + [ StakeIdentifierVerifier <$> pStakeVerifier prefix + , StakeIdentifierAddress <$> pStakeAddress prefix ] -pStakeVerifier :: Parser StakeVerifier -pStakeVerifier = asum - [ StakeVerifierKey <$> pStakeVerificationKeyOrFile Nothing - , StakeVerifierScriptFile <$> pScriptFor "stake-script-file" Nothing "Filepath of the staking script." +pStakeVerifier :: Maybe String -> Parser StakeVerifier +pStakeVerifier prefix = asum + [ StakeVerifierKey <$> pStakeVerificationKeyOrHashOrFile prefix + , StakeVerifierScriptFile <$> pScriptFor (prefixFlag prefix "stake-script-file") Nothing "Filepath of the staking script." ] -pStakeAddress :: Parser StakeAddress -pStakeAddress = +pStakeAddress :: Maybe String -> Parser StakeAddress +pStakeAddress prefix = Opt.option (readerFromParsecParser parseStakeAddress) $ mconcat - [ Opt.long "stake-address" + [ Opt.long $ prefixFlag prefix "stake-address" , Opt.metavar "ADDRESS" , Opt.help "Target stake address (bech32 format)." ] @@ -1295,7 +1295,7 @@ pCertificateFile balanceExecUnits = <$> ( fmap CertificateFile $ asum [ Opt.strOption $ mconcat [ Opt.long "certificate-file" - , Opt.metavar "CERTIFICATEFILE" + , Opt.metavar "FILE" , Opt.help helpText , Opt.completer (Opt.bashCompleter "file") ] diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs index 6b75ba14c8..0038b6d8e9 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs @@ -72,7 +72,7 @@ pMIRPayStakeAddresses :: () pMIRPayStakeAddresses w = GovernanceCreateMirCertificateStakeAddressesCmd w <$> pMIRPot - <*> some pStakeAddress + <*> some (pStakeAddress Nothing) <*> some pRewardAmt <*> pOutputFile 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 bab118c5b8..3a6c0d55c0 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -66,7 +66,7 @@ pGovernanceActionNewInfoCmd era = do Cmd.GovernanceActionInfoCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash <*> pFileOutDirection "out-file" "Path to action file to be used later on with build or build-raw " @@ -86,12 +86,13 @@ pGovernanceActionNewConstitutionCmd era = do Cmd.GovernanceActionCreateConstitutionCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pPreviousGovernanceAction <*> pAnchorUrl <*> pAnchorDataHash <*> pConstitutionUrl <*> pConstitutionHash + <*> optional pConstitutionScriptHash <*> pFileOutDirection "out-file" "Output filepath of the constitution." ) $ Opt.progDesc "Create a constitution." @@ -116,7 +117,7 @@ pUpdateCommitteeCmd eon = Cmd.GoveranceActionUpdateCommitteeCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash <*> many pRemoveCommitteeColdVerificationKeyOrHashOrFile @@ -141,7 +142,7 @@ pGovernanceActionNoConfidenceCmd era = do Cmd.GovernanceActionCreateNoConfidenceCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash <*> pTxId "prev-governance-action-tx-id" "Txid of the previous governance action." @@ -161,7 +162,7 @@ pUpdateProtocolParametersPostConway conwayOnwards = Cmd.UpdateProtocolParametersConwayOnwards conwayOnwards <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash <*> pPreviousGovernanceAction @@ -353,7 +354,7 @@ pGovernanceActionTreasuryWithdrawalCmd era = do Cmd.GovernanceActionTreasuryWithdrawalCmdArgs eon <$> pNetwork <*> pGovActionDeposit - <*> pStakeVerificationKeyOrHashOrFile (Just "deposit-return") + <*> pStakeIdentifier (Just "deposit-return") <*> pAnchorUrl <*> pAnchorDataHash <*> many ((,) <$> pStakeVerificationKeyOrHashOrFile (Just "funds-receiving") <*> pTransferAmt) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs index 5a4f41f433..eee0a37309 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs @@ -75,7 +75,7 @@ pStakeAddressBuildCmd era envCli = do $ subParser "build" $ Opt.info ( StakeAddressBuildCmd w - <$> pStakeVerifier + <$> pStakeVerifier Nothing <*> pNetworkId envCli <*> pMaybeOutputFile ) @@ -90,7 +90,7 @@ pStakeAddressRegistrationCertificateCmd era = do (const $ subParser "registration-certificate" $ Opt.info ( StakeAddressRegistrationCertificateCmd sbe - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> pure Nothing <*> pOutputFile ) @@ -99,7 +99,7 @@ pStakeAddressRegistrationCertificateCmd era = do (const $ subParser "registration-certificate" $ Opt.info ( StakeAddressRegistrationCertificateCmd sbe - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> fmap Just pKeyRegistDeposit <*> pOutputFile ) @@ -118,7 +118,7 @@ pStakeAddressDeregistrationCertificateCmd era = do (\shelleyToBabbage -> subParser "deregistration-certificate" $ Opt.info ( StakeAddressDeregistrationCertificateCmd (shelleyToBabbageEraToShelleyBasedEra shelleyToBabbage) - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> pure Nothing <*> pOutputFile ) @@ -127,7 +127,7 @@ pStakeAddressDeregistrationCertificateCmd era = do (\conwayOnwards -> subParser "deregistration-certificate" $ Opt.info ( StakeAddressDeregistrationCertificateCmd (conwayEraOnwardsToShelleyBasedEra conwayOnwards) - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> fmap Just pKeyRegistDeposit <*> pOutputFile ) @@ -144,7 +144,7 @@ pStakeAddressStakeDelegationCertificateCmd era = do $ subParser "stake-delegation-certificate" $ Opt.info ( StakeAddressStakeDelegationCertificateCmd w - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> pStakePoolVerificationKeyOrHashOrFile Nothing <*> pOutputFile ) @@ -163,7 +163,7 @@ pStakeAddressStakeAndVoteDelegationCertificateCmd era = do $ subParser "stake-and-vote-delegation-certificate" $ Opt.info ( StakeAddressStakeAndVoteDelegationCertificateCmd w - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> pStakePoolVerificationKeyOrHashOrFile Nothing <*> pVoteDelegationTarget <*> pOutputFile @@ -183,7 +183,7 @@ pStakeAddressVoteDelegationCertificateCmd era = do $ subParser "vote-delegation-certificate" $ Opt.info ( StakeAddressVoteDelegationCertificateCmd w - <$> pStakeIdentifier + <$> pStakeIdentifier Nothing <*> pVoteDelegationTarget <*> pOutputFile ) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs index 717fb287b5..13f7f7ca9b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Address.hs @@ -24,7 +24,7 @@ import Cardano.CLI.Types.Common import Cardano.CLI.Types.Errors.AddressCmdError import Cardano.CLI.Types.Key (PaymentVerifier (..), StakeIdentifier (..), StakeVerifier (..), VerificationKeyTextOrFile, generateKeyPair, - readVerificationKeyOrFile, readVerificationKeyTextOrFileAnyOf) + readVerificationKeyOrHashOrFile, readVerificationKeyTextOrFileAnyOf) import qualified Data.ByteString.Char8 as BS import Data.Function @@ -194,10 +194,10 @@ makeStakeAddressRef stakeIdentifier = StakeIdentifierVerifier stakeVerifier -> case stakeVerifier of StakeVerifierKey stkVkeyOrFile -> do - stakeVKey <- firstExceptT AddressCmdReadKeyFileError $ - newExceptT $ readVerificationKeyOrFile AsStakeKey stkVkeyOrFile + stakeVKeyHash <- firstExceptT AddressCmdReadKeyFileError $ + newExceptT $ readVerificationKeyOrHashOrFile AsStakeKey stkVkeyOrFile - return . StakeAddressByValue . StakeCredentialByKey . verificationKeyHash $ stakeVKey + return . StakeAddressByValue $ StakeCredentialByKey stakeVKeyHash StakeVerifierScriptFile (ScriptFile fp) -> do ScriptInAnyLang _lang script <- 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 66065379b3..5d1e86ff5b 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs @@ -87,7 +87,8 @@ runGovernanceActionInfoCmd , Cmd.proposalHash , Cmd.outFile } = do - returnKeyHash <- readStakeKeyHash returnStakeAddress + depositStakeCredential <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier returnStakeAddress let proposalAnchor = L.Anchor { L.anchorUrl = unProposalUrl proposalUrl @@ -96,7 +97,7 @@ runGovernanceActionInfoCmd let sbe = conwayEraOnwardsToShelleyBasedEra eon govAction = InfoAct - proposalProcedure = createProposalProcedure sbe networkId deposit returnKeyHash govAction proposalAnchor + proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAction proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon @@ -118,7 +119,9 @@ runGovernanceActionCreateNoConfidenceCmd , Cmd.governanceActionIndex , Cmd.outFile } = do - returnKeyHash <- readStakeKeyHash returnStakeAddress + depositStakeCredential + <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier returnStakeAddress let proposalAnchor = L.Anchor { L.anchorUrl = unProposalUrl proposalUrl @@ -133,7 +136,7 @@ runGovernanceActionCreateNoConfidenceCmd governanceActionId governanceActionIndex - proposalProcedure = createProposalProcedure sbe networkId deposit returnKeyHash previousGovernanceAction proposalAnchor + proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential previousGovernanceAction proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon @@ -153,10 +156,13 @@ runGovernanceActionCreateConstitutionCmd , Cmd.proposalHash , Cmd.constitutionUrl , Cmd.constitutionHash + , Cmd.constitutionScript , Cmd.outFile } = do - stakeKeyHash <- readStakeKeyHash stakeCredential + depositStakeCredential + <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier stakeCredential let proposalAnchor = L.Anchor { L.anchorUrl = unProposalUrl proposalUrl @@ -170,9 +176,12 @@ runGovernanceActionCreateConstitutionCmd { L.anchorUrl = unConstitutionUrl constitutionUrl , L.anchorDataHash = constitutionHash } - govAct = ProposeNewConstitution prevGovActId constitutionAnchor + govAct = ProposeNewConstitution + prevGovActId + constitutionAnchor + (toShelleyScriptHash <$> L.maybeToStrictMaybe constitutionScript) sbe = conwayEraOnwardsToShelleyBasedEra eon - proposalProcedure = createProposalProcedure sbe networkId deposit stakeKeyHash govAct proposalAnchor + proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAct proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon @@ -217,14 +226,16 @@ runGovernanceActionCreateNewCommitteeCmd & onLeft (left . GovernanceActionsCmdReadFileError) pure (kh, expEpoch) - returnKeyHash <- readStakeKeyHash returnAddress + depositStakeCredential + <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier returnAddress let proposeNewCommittee = ProposeNewCommittee govActIdentifier oldCommitteeKeyHashes (Map.fromList newCommitteeKeyHashes) quorumRational - proposal = createProposalProcedure sbe networkId deposit returnKeyHash proposeNewCommittee proposalAnchor + proposal = createProposalProcedure sbe networkId deposit depositStakeCredential proposeNewCommittee proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon @@ -271,7 +282,9 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do eraBasedPParams <- theUpdate - returnKeyHash <- readStakeKeyHash returnAddr + depositStakeCredential + <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier returnAddr let updateProtocolParams = createEraBasedProtocolParamUpdate sbe eraBasedPParams @@ -284,7 +297,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do (toShelleyScriptHash <$> L.maybeToStrictMaybe mConstitutionalScriptHash) - let proposalProcedure = createProposalProcedure sbe network deposit returnKeyHash govAct proposalAnchor + let proposalProcedure = createProposalProcedure sbe network deposit depositStakeCredential govAct proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints conwayOnwards @@ -348,7 +361,9 @@ runGovernanceActionTreasuryWithdrawalCmd , L.anchorDataHash = proposalHash } - returnKeyHash <- readStakeKeyHash returnAddr + depositStakeCredential + <- firstExceptT GovernanceActionsReadStakeCredErrror + $ getStakeCredentialFromIdentifier returnAddr withdrawals <- forM treasuryWithdrawal $ \(verificationKeyOrHashOrFile, lovelace) -> do stakeKeyHash <- readStakeKeyHash verificationKeyOrHashOrFile @@ -357,7 +372,7 @@ runGovernanceActionTreasuryWithdrawalCmd let sbe = conwayEraOnwardsToShelleyBasedEra eon treasuryWithdrawals = TreasuryWithdrawal withdrawals (toShelleyScriptHash <$> L.maybeToStrictMaybe constitutionScriptHash) - proposal = createProposalProcedure sbe networkId deposit returnKeyHash treasuryWithdrawals proposalAnchor + proposal = createProposalProcedure sbe networkId deposit depositStakeCredential treasuryWithdrawals proposalAnchor firstExceptT GovernanceActionsCmdWriteFileError . newExceptT $ conwayEraOnwardsConstraints eon diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index a1f81c395d..9572b1696f 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -141,7 +141,7 @@ pAddressCmds envCli = pAddressBuild :: Parser LegacyAddressCmds pAddressBuild = AddressBuild <$> pPaymentVerifier - <*> Opt.optional pStakeIdentifier + <*> Opt.optional (pStakeIdentifier Nothing) <*> pNetworkId envCli <*> pMaybeOutputFile @@ -187,7 +187,7 @@ pStakeAddressCmds envCli = pStakeAddressBuildCmd :: Parser LegacyStakeAddressCmds pStakeAddressBuildCmd = StakeAddressBuildCmd - <$> pStakeVerifier + <$> pStakeVerifier Nothing <*> pNetworkId envCli <*> pMaybeOutputFile @@ -195,7 +195,7 @@ pStakeAddressCmds envCli = pStakeAddressRegistrationCertificateCmd = StakeAddressRegistrationCertificateCmd <$> pAnyShelleyBasedEra envCli - <*> pStakeIdentifier + <*> pStakeIdentifier Nothing <*> optional pKeyRegistDeposit <*> pOutputFile @@ -203,7 +203,7 @@ pStakeAddressCmds envCli = pStakeAddressDeregistrationCertificateCmd = StakeAddressDeregistrationCertificateCmd <$> pAnyShelleyBasedEra envCli - <*> pStakeIdentifier + <*> pStakeIdentifier Nothing <*> optional pKeyRegistDeposit <*> pOutputFile @@ -211,7 +211,7 @@ pStakeAddressCmds envCli = pStakeAddressStakeDelegationCertificateCmd = StakeAddressDelegationCertificateCmd <$> pAnyShelleyBasedEra envCli - <*> pStakeIdentifier + <*> pStakeIdentifier Nothing <*> pStakePoolVerificationKeyOrHashOrFile Nothing <*> pOutputFile @@ -830,7 +830,7 @@ pGovernanceCmds envCli = GovernanceCreateMirCertificateStakeAddressesCmd <$> pAnyShelleyToBabbageEra envCli <*> pMIRPot - <*> some pStakeAddress + <*> some (pStakeAddress Nothing) <*> some pRewardAmt <*> pOutputFile diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index f430c2e091..889a44015c 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -1040,10 +1040,10 @@ getStakeCredentialFromVerifier = \case pure $ StakeCredentialByScript $ hashScript script StakeVerifierKey stakeVerKeyOrFile -> do - stakeVerKey <- - ExceptT (readVerificationKeyOrFile AsStakeKey stakeVerKeyOrFile) + stakeVerKeyHash <- + ExceptT (readVerificationKeyOrHashOrFile AsStakeKey stakeVerKeyOrFile) & firstExceptT StakeCredentialInputDecodeError - pure $ StakeCredentialByKey $ verificationKeyHash stakeVerKey + pure $ StakeCredentialByKey stakeVerKeyHash getStakeCredentialFromIdentifier :: () => StakeIdentifier diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs index a7840ad3a1..72dcb212f0 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/GovernanceActionsError.hs @@ -7,12 +7,14 @@ module Cardano.CLI.Types.Errors.GovernanceActionsError import Cardano.Api import Cardano.CLI.Read +import Cardano.CLI.Types.Errors.StakeCredentialError data GovernanceActionsError = GovernanceActionsCmdConstitutionError ConstitutionError | GovernanceActionsCmdProposalError ProposalError | GovernanceActionsCmdCostModelsError CostModelsError | GovernanceActionsCmdReadFileError (FileError InputDecodeError) + | GovernanceActionsReadStakeCredErrror StakeCredentialError | GovernanceActionsCmdReadTextEnvelopeFileError (FileError TextEnvelopeError) | GovernanceActionsCmdWriteFileError (FileError ()) | GovernanceActionsValueUpdateProtocolParametersNotFound AnyShelleyBasedEra @@ -37,3 +39,5 @@ instance Error GovernanceActionsError where [ "Protocol parameters update value for " <> pshow (toCardanoEra expectedShelleyEra) , " was not found." ] + GovernanceActionsReadStakeCredErrror e -> + prettyError e diff --git a/cardano-cli/src/Cardano/CLI/Types/Key.hs b/cardano-cli/src/Cardano/CLI/Types/Key.hs index 6ab142bdd8..f635958638 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Key.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Key.hs @@ -121,7 +121,7 @@ data PaymentVerifier deriving (Eq, Show) data StakeVerifier - = StakeVerifierKey (VerificationKeyOrFile StakeKey) + = StakeVerifierKey (VerificationKeyOrHashOrFile StakeKey) | StakeVerifierScriptFile ScriptFile deriving (Eq, Show) diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash b/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash index 18a1b58d25..67040a92f1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash +++ b/cardano-cli/test/cardano-cli-golden/files/golden/governance/hash/foo.script.hash @@ -1 +1 @@ -7dde1be4d1a2f617ac343dd7ef0388cf497c19ba8dab653a5b9eb1e2 +7dde1be4d1a2f617ac343dd7ef0388cf497c19ba8dab653a5b9eb1e2 \ No newline at end of file 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 ca88f295b3..737d3db0f4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help.cli @@ -57,6 +57,7 @@ Usage: cardano-cli shelley address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -664,6 +665,7 @@ Usage: cardano-cli shelley stake-address key-hash Usage: cardano-cli shelley stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -676,6 +678,7 @@ Usage: cardano-cli shelley stake-address build Usage: cardano-cli shelley stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -686,6 +689,7 @@ Usage: cardano-cli shelley stake-address registration-certificate Usage: cardano-cli shelley stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -696,6 +700,7 @@ Usage: cardano-cli shelley stake-address deregistration-certificate Usage: cardano-cli shelley stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -876,8 +881,7 @@ Usage: cardano-cli shelley transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -1006,8 +1010,7 @@ Usage: cardano-cli shelley transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -1216,6 +1219,7 @@ Usage: cardano-cli allegra address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -1823,6 +1827,7 @@ Usage: cardano-cli allegra stake-address key-hash Usage: cardano-cli allegra stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -1835,6 +1840,7 @@ Usage: cardano-cli allegra stake-address build Usage: cardano-cli allegra stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -1845,6 +1851,7 @@ Usage: cardano-cli allegra stake-address registration-certificate Usage: cardano-cli allegra stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -1855,6 +1862,7 @@ Usage: cardano-cli allegra stake-address deregistration-certificate Usage: cardano-cli allegra stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -2035,8 +2043,7 @@ Usage: cardano-cli allegra transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -2165,8 +2172,7 @@ Usage: cardano-cli allegra transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -2375,6 +2381,7 @@ Usage: cardano-cli mary address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -2976,6 +2983,7 @@ Usage: cardano-cli mary stake-address key-hash Usage: cardano-cli mary stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -2988,6 +2996,7 @@ Usage: cardano-cli mary stake-address build Usage: cardano-cli mary stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -2998,6 +3007,7 @@ Usage: cardano-cli mary stake-address registration-certificate Usage: cardano-cli mary stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -3008,6 +3018,7 @@ Usage: cardano-cli mary stake-address deregistration-certificate Usage: cardano-cli mary stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -3187,8 +3198,7 @@ Usage: cardano-cli mary transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -3315,7 +3325,7 @@ Usage: cardano-cli mary transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -3516,6 +3526,7 @@ Usage: cardano-cli alonzo address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -4128,6 +4139,7 @@ Usage: cardano-cli alonzo stake-address key-hash Usage: cardano-cli alonzo stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -4140,6 +4152,7 @@ Usage: cardano-cli alonzo stake-address build Usage: cardano-cli alonzo stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -4150,6 +4163,7 @@ Usage: cardano-cli alonzo stake-address registration-certificate Usage: cardano-cli alonzo stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -4160,6 +4174,7 @@ Usage: cardano-cli alonzo stake-address deregistration-certificate Usage: cardano-cli alonzo stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -4339,8 +4354,7 @@ Usage: cardano-cli alonzo transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -4469,8 +4483,7 @@ Usage: cardano-cli alonzo transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -4679,6 +4692,7 @@ Usage: cardano-cli babbage address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -5312,6 +5326,7 @@ Usage: cardano-cli babbage stake-address key-hash Usage: cardano-cli babbage stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -5324,6 +5339,7 @@ Usage: cardano-cli babbage stake-address build Usage: cardano-cli babbage stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -5334,6 +5350,7 @@ Usage: cardano-cli babbage stake-address registration-certificate Usage: cardano-cli babbage stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -5344,6 +5361,7 @@ Usage: cardano-cli babbage stake-address deregistration-certificate Usage: cardano-cli babbage stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -5524,8 +5542,7 @@ Usage: cardano-cli babbage transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -5654,8 +5671,7 @@ Usage: cardano-cli babbage transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -5864,6 +5880,7 @@ Usage: cardano-cli conway address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -6109,6 +6126,8 @@ Usage: cardano-cli conway governance action create-constitution ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD32] @@ -6116,6 +6135,7 @@ Usage: cardano-cli conway governance action create-constitution --anchor-data-hash HASH --constitution-url TEXT --constitution-hash HASH + [--constitution-script-hash HASH] --out-file FILE Create a constitution. @@ -6128,6 +6148,8 @@ Usage: cardano-cli conway governance action update-committee ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -6153,6 +6175,8 @@ Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -6168,6 +6192,8 @@ Usage: cardano-cli conway governance action create-no-confidence ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -6185,6 +6211,8 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -6246,6 +6274,8 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -6849,6 +6879,7 @@ Usage: cardano-cli conway stake-address key-hash Usage: cardano-cli conway stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -6861,6 +6892,7 @@ Usage: cardano-cli conway stake-address build Usage: cardano-cli conway stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -6872,6 +6904,7 @@ Usage: cardano-cli conway stake-address registration-certificate Usage: cardano-cli conway stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -6883,6 +6916,7 @@ Usage: cardano-cli conway stake-address deregistration-certificate Usage: cardano-cli conway stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -6898,6 +6932,7 @@ Usage: cardano-cli conway stake-address stake-delegation-certificate Usage: cardano-cli conway stake-address stake-and-vote-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -6920,6 +6955,7 @@ Usage: cardano-cli conway stake-address stake-and-vote-delegation-certificate Usage: cardano-cli conway stake-address vote-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -7102,8 +7138,7 @@ Usage: cardano-cli conway transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -7247,8 +7282,7 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -7468,6 +7502,7 @@ Usage: cardano-cli latest address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -8099,6 +8134,7 @@ Usage: cardano-cli latest stake-address key-hash Usage: cardano-cli latest stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -8111,6 +8147,7 @@ Usage: cardano-cli latest stake-address build Usage: cardano-cli latest stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -8121,6 +8158,7 @@ Usage: cardano-cli latest stake-address registration-certificate Usage: cardano-cli latest stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -8131,6 +8169,7 @@ Usage: cardano-cli latest stake-address deregistration-certificate Usage: cardano-cli latest stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -8310,8 +8349,7 @@ Usage: cardano-cli latest transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -8440,8 +8478,7 @@ Usage: cardano-cli latest transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -9325,8 +9362,7 @@ Usage: cardano-cli legacy transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -9461,8 +9497,7 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -9754,6 +9789,7 @@ Usage: cardano-cli legacy stake-address key-gen [--key-output-format STRING] Usage: cardano-cli legacy stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -9781,6 +9817,7 @@ Usage: cardano-cli legacy stake-address registration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -9799,6 +9836,7 @@ Usage: cardano-cli legacy stake-address deregistration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -9817,6 +9855,7 @@ Usage: cardano-cli legacy stake-address delegation-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -9857,6 +9896,7 @@ Usage: cardano-cli legacy address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -10550,7 +10590,7 @@ Usage: cardano-cli transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -10680,7 +10720,7 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -10957,6 +10997,7 @@ Usage: cardano-cli stake-address key-gen [--key-output-format STRING] Usage: cardano-cli stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) (--mainnet | --testnet-magic NATURAL) @@ -10982,6 +11023,7 @@ Usage: cardano-cli stake-address registration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -11000,6 +11042,7 @@ Usage: cardano-cli stake-address deregistration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -11018,6 +11061,7 @@ Usage: cardano-cli stake-address delegation-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -11058,6 +11102,7 @@ Usage: cardano-cli address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/address_build.cli index 3c7bc55c6b..06ce42fe21 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_address_build.cli index 9f797a3e80..ce23a004a0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli allegra address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_build.cli index 1855097456..e7ae0fd1c6 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli allegra stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_deregistration-certificate.cli index 8fa400c9fa..d94a9bb858 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli allegra stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_registration-certificate.cli index beaca7bee8..075c666349 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli allegra stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli index 77bcc3a7bb..178b12e8d7 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli allegra stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build-raw.cli index e8fb60b493..9168bbea7d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli allegra transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build.cli index 3710891550..9cd5d33330 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli allegra transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -306,8 +305,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_address_build.cli index 18239b1f55..84b5746937 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli alonzo address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_build.cli index e9374be065..e3611d8440 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli alonzo stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_deregistration-certificate.cli index 7b47ea7586..56a35c5aff 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli alonzo stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_registration-certificate.cli index 88a33ce08a..dc486615c9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli alonzo stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli index 431a172a92..974a530e29 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli alonzo stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build-raw.cli index 17afe0d58c..440d85c008 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli alonzo transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build.cli index f4d8236372..f2de5b5d29 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli alonzo transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -306,8 +305,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_address_build.cli index 9c97caec4e..a2dc65f31b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli babbage address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_build.cli index 6d69f4191b..756918691f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli babbage stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_deregistration-certificate.cli index bfbb053a96..bb35472bd5 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli babbage stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_registration-certificate.cli index d69a01226e..13aebd6187 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli babbage stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli index fa992a2b23..2f26285736 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli babbage stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build-raw.cli index 6dbaf209e3..05256172f9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli babbage transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build.cli index ea9fd6a970..a3b91f389a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli babbage transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -306,8 +305,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_address_build.cli index fbee8eaec8..c921606ddb 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli conway address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the 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 d334ebba64..efa8460f1b 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 @@ -6,6 +6,8 @@ Usage: cardano-cli conway governance action create-constitution ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) [--prev-governance-action-tx-id TXID --prev-governance-action-index WORD32] @@ -13,6 +15,7 @@ Usage: cardano-cli conway governance action create-constitution --anchor-data-hash HASH --constitution-url TEXT --constitution-hash HASH + [--constitution-script-hash HASH] --out-file FILE Create a constitution. @@ -28,6 +31,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --prev-governance-action-tx-id TXID Txid of the previous governance action. --prev-governance-action-index WORD32 @@ -39,5 +46,8 @@ Available options: --constitution-hash HASH Hash of the constitution data (obtain it with "cardano-cli conway governance hash anchor-data ..."). + --constitution-script-hash HASH + Constitution script hash (hex-encoded). Obtain it + with "cardano-cli conway governance hash script ...". --out-file FILE Output filepath of the constitution. -h,--help Show this help text 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 325a29f118..c87ac1dcb5 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 @@ -3,6 +3,8 @@ Usage: cardano-cli conway governance action create-info (--mainnet | --testnet) ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -21,6 +23,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash anchor-data ...") 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 bdf1e21420..8357e129d4 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 @@ -6,6 +6,8 @@ Usage: cardano-cli conway governance action create-no-confidence ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -26,6 +28,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash anchor-data ...") 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 1f659007a7..57bc373bdb 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 @@ -6,6 +6,8 @@ Usage: cardano-cli conway governance action create-protocol-parameters-update ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -70,6 +72,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash anchor-data ...") 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 250cf51d87..a6f4da465a 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 @@ -6,6 +6,8 @@ Usage: cardano-cli conway governance action create-treasury-withdrawal ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -31,6 +33,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash anchor-data ...") 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 846aa5e33a..eae7014ec8 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 @@ -6,6 +6,8 @@ Usage: cardano-cli conway governance action update-committee ( --deposit-return-stake-verification-key STRING | --deposit-return-stake-verification-key-file FILE | --deposit-return-stake-key-hash HASH + | --deposit-return-stake-script-file FILE + | --deposit-return-stake-address ADDRESS ) --anchor-url TEXT --anchor-data-hash HASH @@ -37,6 +39,10 @@ Available options: Filepath of the staking verification key. --deposit-return-stake-key-hash HASH Stake verification key hash (hex-encoded). + --deposit-return-stake-script-file FILE + Filepath of the staking script. + --deposit-return-stake-address ADDRESS + Target stake address (bech32 format). --anchor-url TEXT Anchor URL --anchor-data-hash HASH Proposal anchor data hash (obtain it with "cardano-cli conway governance hash anchor-data ...") diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_build.cli index 5891605032..480b96ce5c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_deregistration-certificate.cli index 8b46c7ce49..573c3081e3 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -14,6 +15,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_registration-certificate.cli index 410dcf4bf4..36faa447f2 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -14,6 +15,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli index d68afda1ae..24da4d2f5b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-and-vote-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address stake-and-vote-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -25,6 +26,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli index 5a9e45ae12..bb7ffcafa6 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_vote-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_vote-delegation-certificate.cli index dbfc7c4ee7..0fdd8577be 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_vote-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_stake-address_vote-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli conway stake-address vote-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -21,6 +22,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --drep-script-hash HASH DRep script hash (hex-encoded). Obtain it with diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli index b52d9513eb..c65587974d 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli conway transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -318,8 +317,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli index 609156fd97..73e21d63ac 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/conway_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli conway transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -317,8 +316,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_address_build.cli index 2af8e5979f..5f16182b12 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli latest address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_build.cli index 663c2cc32e..5b0b30a041 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli latest stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_deregistration-certificate.cli index cd5c510ba4..6beb520e1c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli latest stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_registration-certificate.cli index 7c0fd6b6d8..ebf274735f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli latest stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli index ae37705743..f8c5d9677a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli latest stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli index 8fa3ca7ac5..1472a33d49 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli latest transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli index 385c74602f..a3e9eee307 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli latest transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -306,8 +305,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_address_build.cli index 89c44d05d4..dfef7b3250 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli legacy address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_build.cli index 9d135aa86a..cfa4ad42c0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli legacy stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli index e8b0500f5c..9b66edd189 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_delegation-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli legacy stake-address delegation-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -30,6 +31,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_deregistration-certificate.cli index df41048c41..9671ea1b6a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_deregistration-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli legacy stake-address deregistration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -27,6 +28,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_registration-certificate.cli index 62ee16c1ee..4f0c91f98f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_stake-address_registration-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli legacy stake-address registration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -27,6 +28,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli index 29924916be..582979acf4 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build-raw.cli @@ -82,8 +82,7 @@ Usage: cardano-cli legacy transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -316,8 +315,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli index b79864ff38..302aeec2fd 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/legacy_transaction_build.cli @@ -82,8 +82,7 @@ Usage: cardano-cli legacy transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -329,8 +328,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_address_build.cli index 556ffa5403..4cf1249b85 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli mary address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_build.cli index 803bf839dd..e038ba4677 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli mary stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_deregistration-certificate.cli index 413b6c5bb5..77e9a54925 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli mary stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_registration-certificate.cli index e93f114dca..668a2f6a4f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli mary stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli index 24077fc465..83e7f3085c 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli mary stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build-raw.cli index 1ac4f3189d..8e4f143a52 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli mary transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build.cli index 3b38214e65..f2b0ea6f0f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_transaction_build.cli @@ -74,7 +74,7 @@ Usage: cardano-cli mary transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -303,8 +303,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_address_build.cli index 151be0319c..26351344d9 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_address_build.cli @@ -5,6 +5,7 @@ Usage: cardano-cli shelley address build ) [ --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ] @@ -24,6 +25,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --mainnet Use the mainnet magic id. This overrides the diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_build.cli index 6f3a281db7..85186bf65f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli shelley stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) ( --mainnet @@ -15,6 +16,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_deregistration-certificate.cli index 23c669dae6..3f801d84aa 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_deregistration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli shelley stake-address deregistration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_registration-certificate.cli index e6cd9b2ea7..beb43553ef 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_registration-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli shelley stake-address registration-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --out-file FILE The output file. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli index adfa1c7363..0ef47ff17f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_stake-address_stake-delegation-certificate.cli @@ -1,6 +1,7 @@ Usage: cardano-cli shelley stake-address stake-delegation-certificate ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -18,6 +19,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build-raw.cli index 88d168537a..5aa3ff6589 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build-raw.cli @@ -75,8 +75,7 @@ Usage: cardano-cli shelley transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -303,8 +302,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build.cli index 124e5948f6..7c7a76b146 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_transaction_build.cli @@ -76,8 +76,7 @@ Usage: cardano-cli shelley transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [ - --certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -306,8 +305,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_build.cli index daff95e3ce..93f07bdd3f 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_build.cli @@ -1,6 +1,7 @@ Usage: cardano-cli stake-address build ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE ) (--mainnet | --testnet-magic NATURAL) @@ -13,6 +14,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --mainnet Use the mainnet magic id. This overrides the CARDANO_NODE_NETWORK_ID environment variable diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli index aba66f34d3..c1e421604b 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_delegation-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli stake-address delegation-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -30,6 +31,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --stake-pool-verification-key STRING diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_deregistration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_deregistration-certificate.cli index 54bdc94cff..3236ed020a 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_deregistration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_deregistration-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli stake-address deregistration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -27,6 +28,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_registration-certificate.cli index 60e8069a9b..a3e5492c41 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_registration-certificate.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/stake-address_registration-certificate.cli @@ -8,6 +8,7 @@ Usage: cardano-cli stake-address registration-certificate ] ( --stake-verification-key STRING | --stake-verification-key-file FILE + | --stake-key-hash HASH | --stake-script-file FILE | --stake-address ADDRESS ) @@ -27,6 +28,7 @@ Available options: Stake verification key (Bech32 or hex-encoded). --stake-verification-key-file FILE Filepath of the staking verification key. + --stake-key-hash HASH Stake verification key hash (hex-encoded). --stake-script-file FILE Filepath of the staking script. --stake-address ADDRESS Target stake address (bech32 format). --key-reg-deposit-amt NATURAL diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli index d625654446..49d9a1aed1 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build-raw.cli @@ -80,7 +80,7 @@ Usage: cardano-cli transaction build-raw [--invalid-before SLOT] [--invalid-hereafter SLOT] [--fee LOVELACE] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ ( --certificate-redeemer-cbor-file CBOR FILE @@ -313,8 +313,7 @@ Available options: --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). --fee LOVELACE The fee amount in Lovelace. - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli index 955e684e29..bd62fce705 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli +++ b/cardano-cli/test/cardano-cli-golden/files/golden/help/transaction_build.cli @@ -77,7 +77,7 @@ Usage: cardano-cli transaction build --socket-path SOCKET_PATH )] [--invalid-before SLOT] [--invalid-hereafter SLOT] - [--certificate-file CERTIFICATEFILE + [--certificate-file FILE [ --certificate-script-file FILE [ --certificate-redeemer-cbor-file CBOR FILE | --certificate-redeemer-file JSON FILE @@ -323,8 +323,7 @@ Available options: --policy-id HASH Policy id of minting script. --invalid-before SLOT Time that transaction is valid from (in slots). --invalid-hereafter SLOT Time that transaction is valid until (in slots). - --certificate-file CERTIFICATEFILE - Filepath of the certificate. This encompasses all + --certificate-file FILE Filepath of the certificate. This encompasses all types of certificates (stake pool certificates, stake key certificates etc). Optionally specify a script witness. diff --git a/flake.lock b/flake.lock index 5ba63aee5a..e761acbc5f 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1708623073, - "narHash": "sha256-4V4gwvyqBQ9LD/H7W5C9SNw8XYX7DauLpo0upR7bD1Y=", + "lastModified": 1708691792, + "narHash": "sha256-UpT9e8jYZSB+Z4PQOtQRutCSkEIB/gXtYJTvsZTNLro=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "5a82d3179f692326bc560becc4fe14625a361840", + "rev": "e03c6c68bd5d9350f11976d5a61e3c2079005605", "type": "github" }, "original": {