From 5cc2922905ad253abe276c7965ae3f625416bcf5 Mon Sep 17 00:00:00 2001 From: John Ky Date: Mon, 2 Oct 2023 11:35:34 +1100 Subject: [PATCH] Update to cardano-api-8.23.1.0 --- cabal.project | 2 +- cardano-cli/cardano-cli.cabal | 2 +- cardano-cli/src/Cardano/CLI/Byron/Tx.hs | 4 +- cardano-cli/src/Cardano/CLI/Environment.hs | 30 ++--- .../Cardano/CLI/EraBased/Options/Common.hs | 70 ++++++------ .../CLI/EraBased/Options/Governance.hs | 2 +- .../EraBased/Options/Governance/Actions.hs | 12 +- .../EraBased/Options/Governance/Committee.hs | 10 +- .../CLI/EraBased/Options/Governance/DRep.hs | 6 +- .../CLI/EraBased/Options/Governance/Query.hs | 10 +- .../CLI/EraBased/Options/Governance/Vote.hs | 2 +- .../CLI/EraBased/Options/StakeAddress.hs | 16 +-- .../Cardano/CLI/EraBased/Options/StakePool.hs | 4 +- .../Cardano/CLI/EraBased/Run/Transaction.hs | 49 +++------ cardano-cli/src/Cardano/CLI/Json/Friendly.hs | 6 +- .../Cardano/CLI/Legacy/Commands/Governance.hs | 6 +- .../CLI/Legacy/Commands/StakeAddress.hs | 6 +- .../Cardano/CLI/Legacy/Commands/StakePool.hs | 4 +- cardano-cli/src/Cardano/CLI/Legacy/Options.hs | 5 +- .../src/Cardano/CLI/Legacy/Run/Governance.hs | 13 ++- .../Cardano/CLI/Legacy/Run/StakeAddress.hs | 12 +- .../src/Cardano/CLI/Legacy/Run/StakePool.hs | 8 +- cardano-cli/src/Cardano/CLI/Read.hs | 4 +- .../Errors/StakeAddressDelegationError.hs | 10 +- .../CLI/Types/Errors/TxValidationError.hs | 103 +++++++----------- .../files/golden/allegra/transaction-view.out | 3 +- .../files/golden/alonzo/verification.key | 5 - ...vernance_drep_registration-certificate.cli | 84 -------------- ...vernance_drep_registration-certificate.cli | 84 -------------- ...vernance_drep_registration-certificate.cli | 84 -------------- ...vernance_drep_registration-certificate.cli | 84 -------------- ...vernance_drep_registration-certificate.cli | 84 -------------- ...vernance_drep_registration-certificate.cli | 84 -------------- .../golden/shelley/genesis.conway.spec.json | 3 - .../shelley/governance/answer/basic.json | 22 ---- .../files/golden/shelley/governance/cold.sk | 5 - .../shelley/governance/polls/long-text.json | 5 - .../golden/shelley/governance/verify/invalid | 5 - .../shelley/governance/verify/malformed | 5 - .../golden/shelley/governance/verify/mismatch | 5 - .../golden/shelley/governance/verify/none | 5 - .../tx-body-file | 5 - .../transaction-sign/initial-utxo1.skey | 5 - .../transaction-sign/initial-utxo2.skey | 5 - .../shelley/transaction-sign/tx-body-file | 5 - .../files/golden/shelley/tx/tx | 5 - .../files/golden/shelley/update-proposal | 5 - flake.lock | 6 +- 48 files changed, 173 insertions(+), 826 deletions(-) delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/alonzo/verification.key delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_drep_registration-certificate.cli delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/genesis.conway.spec.json delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/answer/basic.json delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/cold.sk delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/polls/long-text.json delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/none delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-calculate-min-fee/tx-body-file delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo1.skey delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo2.skey delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/tx-body-file delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/tx/tx delete mode 100644 cardano-cli/test/cardano-cli-golden/files/golden/shelley/update-proposal diff --git a/cabal.project b/cabal.project index 52f8d616cb..5d31bd9478 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 2023-08-08T19:56:09Z - , cardano-haskell-packages 2023-09-27T09:51:59Z + , cardano-haskell-packages 2023-10-01T12:37:02Z packages: cardano-cli diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal index 962dbbaee2..30a434b616 100644 --- a/cardano-cli/cardano-cli.cabal +++ b/cardano-cli/cardano-cli.cabal @@ -200,7 +200,7 @@ library , binary , bytestring , canonical-json - , cardano-api ^>= 8.22 + , cardano-api ^>= 8.23.1 , cardano-binary , cardano-crypto , cardano-crypto-class ^>= 2.1.2 diff --git a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs index 843f4cf8a9..1f4788ddcb 100644 --- a/cardano-cli/src/Cardano/CLI/Byron/Tx.hs +++ b/cardano-cli/src/Cardano/CLI/Byron/Tx.hs @@ -160,7 +160,7 @@ txSpendGenesisUTxOByronPBFT gc nId sk (ByronAddress bAddr) outs = do , txFee = TxFeeImplicit ByronEraOnlyByron , txValidityRange = ( TxValidityNoLowerBound - , TxValidityNoUpperBound ValidityNoUpperBoundInByronEra + , defaultTxValidityUpperBound ) , txMetadata = TxMetadataNone , txAuxScripts = TxAuxScriptsNone @@ -209,7 +209,7 @@ txSpendUTxOByronPBFT nId sk txIns outs = do , txFee = TxFeeImplicit ByronEraOnlyByron , txValidityRange = ( TxValidityNoLowerBound - , TxValidityNoUpperBound ValidityNoUpperBoundInByronEra + , defaultTxValidityUpperBound ) , txMetadata = TxMetadataNone , txAuxScripts = TxAuxScriptsNone diff --git a/cardano-cli/src/Cardano/CLI/Environment.hs b/cardano-cli/src/Cardano/CLI/Environment.hs index 932bdf71eb..a93b2d3465 100644 --- a/cardano-cli/src/Cardano/CLI/Environment.hs +++ b/cardano-cli/src/Cardano/CLI/Environment.hs @@ -11,9 +11,9 @@ module Cardano.CLI.Environment , getEnvSocketPath ) where -import Cardano.Api (AnyCardanoEra (..), AnyShelleyBasedEra (..), - AnyShelleyToBabbageEra (..), CardanoEra (..), NetworkId (..), NetworkMagic (..), - ShelleyBasedEra (..), ShelleyToBabbageEra (..)) +import Cardano.Api (AnyCardanoEra (..), AnyEraInEon (..), CardanoEra (..), NetworkId (..), + NetworkMagic (..), ShelleyBasedEra (..), ShelleyToBabbageEra (..), + forEraInEonMaybe) import Data.Word (Word32) import qualified System.Environment as IO @@ -38,31 +38,15 @@ getEnvCli = do , envCliAnyCardanoEra = mCardanoEra } -envCliAnyShelleyBasedEra :: EnvCli -> Maybe AnyShelleyBasedEra +envCliAnyShelleyBasedEra :: EnvCli -> Maybe (AnyEraInEon ShelleyBasedEra) envCliAnyShelleyBasedEra envCli = do AnyCardanoEra era <- envCliAnyCardanoEra envCli + forEraInEonMaybe era AnyEraInEon - case era of - ByronEra -> Nothing - ShelleyEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraShelley - AllegraEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraAllegra - MaryEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraMary - AlonzoEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraAlonzo - BabbageEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraBabbage - ConwayEra -> Just $ AnyShelleyBasedEra ShelleyBasedEraConway - -envCliAnyShelleyToBabbageEra :: EnvCli -> Maybe AnyShelleyToBabbageEra +envCliAnyShelleyToBabbageEra :: EnvCli -> Maybe (AnyEraInEon ShelleyToBabbageEra) envCliAnyShelleyToBabbageEra envCli = do AnyCardanoEra era <- envCliAnyCardanoEra envCli - - case era of - ByronEra -> Nothing - ShelleyEra -> Just $ AnyShelleyToBabbageEra ShelleyToBabbageEraShelley - AllegraEra -> Just $ AnyShelleyToBabbageEra ShelleyToBabbageEraAllegra - MaryEra -> Just $ AnyShelleyToBabbageEra ShelleyToBabbageEraMary - AlonzoEra -> Just $ AnyShelleyToBabbageEra ShelleyToBabbageEraAlonzo - BabbageEra -> Just $ AnyShelleyToBabbageEra ShelleyToBabbageEraBabbage - ConwayEra -> Nothing + forEraInEonMaybe era AnyEraInEon -- | If the environment variable @CARDANO_NODE_NETWORK_ID@ is set, then return the network id therein. -- Otherwise, return 'Nothing'. diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs index 9e0c3fa266..59ee2e42f8 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs @@ -58,11 +58,11 @@ import qualified Text.Parsec.String as Parsec import qualified Text.Parsec.Token as Parsec import Text.Read (readEither, readMaybe) -defaultShelleyBasedEra :: AnyShelleyBasedEra -defaultShelleyBasedEra = AnyShelleyBasedEra ShelleyBasedEraBabbage +defaultShelleyBasedEra :: AnyEraInEon ShelleyBasedEra +defaultShelleyBasedEra = AnyEraInEon ShelleyBasedEraBabbage -defaultShelleyToBabbageEra :: AnyShelleyToBabbageEra -defaultShelleyToBabbageEra = AnyShelleyToBabbageEra ShelleyToBabbageEraBabbage +defaultShelleyToBabbageEra :: AnyEraInEon ShelleyToBabbageEra +defaultShelleyToBabbageEra = AnyEraInEon ShelleyToBabbageEraBabbage command' :: String -> String -> Parser a -> Mod CommandFields a command' c descr p = @@ -301,113 +301,113 @@ subInfoParser name i mps = case catMaybes mps of [] -> Nothing parsers -> Just $ subParser name $ Opt.info (asum parsers) i -pAnyShelleyBasedEra :: EnvCli -> Parser AnyShelleyBasedEra +pAnyShelleyBasedEra :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pAnyShelleyBasedEra envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraShelley) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraShelley) $ mconcat [Opt.long "shelley-era", Opt.help "Specify the Shelley era"] - , Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraAllegra) + , Opt.flag' (AnyEraInEon ShelleyBasedEraAllegra) $ mconcat [Opt.long "allegra-era", Opt.help "Specify the Allegra era"] - , Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraMary) + , Opt.flag' (AnyEraInEon ShelleyBasedEraMary) $ mconcat [Opt.long "mary-era", Opt.help "Specify the Mary era"] - , Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraAlonzo) + , Opt.flag' (AnyEraInEon ShelleyBasedEraAlonzo) $ mconcat [Opt.long "alonzo-era", Opt.help "Specify the Alonzo era"] - , Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraBabbage) + , Opt.flag' (AnyEraInEon ShelleyBasedEraBabbage) $ mconcat [Opt.long "babbage-era", Opt.help "Specify the Babbage era (default)"] - , Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraConway) + , Opt.flag' (AnyEraInEon ShelleyBasedEraConway) $ mconcat [Opt.long "conway-era", Opt.help "Specify the Conway era"] ] , maybeToList $ pure <$> envCliAnyShelleyBasedEra envCli , pure $ pure defaultShelleyBasedEra ] -pAnyShelleyToBabbageEra :: EnvCli -> Parser AnyShelleyToBabbageEra +pAnyShelleyToBabbageEra :: EnvCli -> Parser (AnyEraInEon ShelleyToBabbageEra) pAnyShelleyToBabbageEra envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyToBabbageEra ShelleyToBabbageEraShelley) + [ [ Opt.flag' (AnyEraInEon ShelleyToBabbageEraShelley) $ mconcat [Opt.long "shelley-era", Opt.help "Specify the Shelley era"] - , Opt.flag' (AnyShelleyToBabbageEra ShelleyToBabbageEraAllegra) + , Opt.flag' (AnyEraInEon ShelleyToBabbageEraAllegra) $ mconcat [Opt.long "allegra-era", Opt.help "Specify the Allegra era"] - , Opt.flag' (AnyShelleyToBabbageEra ShelleyToBabbageEraMary) + , Opt.flag' (AnyEraInEon ShelleyToBabbageEraMary) $ mconcat [Opt.long "mary-era", Opt.help "Specify the Mary era"] - , Opt.flag' (AnyShelleyToBabbageEra ShelleyToBabbageEraAlonzo) + , Opt.flag' (AnyEraInEon ShelleyToBabbageEraAlonzo) $ mconcat [Opt.long "alonzo-era", Opt.help "Specify the Alonzo era"] - , Opt.flag' (AnyShelleyToBabbageEra ShelleyToBabbageEraBabbage) + , Opt.flag' (AnyEraInEon ShelleyToBabbageEraBabbage) $ mconcat [Opt.long "babbage-era", Opt.help "Specify the Babbage era (default)"] ] , maybeToList $ pure <$> envCliAnyShelleyToBabbageEra envCli , pure $ pure defaultShelleyToBabbageEra ] -pShelleyBasedShelley :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedShelley :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedShelley envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraShelley) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraShelley) $ mconcat [Opt.long "shelley-era", Opt.help "Specify the Shelley era"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraShelley) + $ mfilter (== AnyEraInEon ShelleyBasedEraShelley) $ envCliAnyShelleyBasedEra envCli ] -pShelleyBasedAllegra :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedAllegra :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedAllegra envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraAllegra) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraAllegra) $ mconcat [Opt.long "allegra-era", Opt.help "Specify the Allegra era"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraAllegra) + $ mfilter (== AnyEraInEon ShelleyBasedEraAllegra) $ envCliAnyShelleyBasedEra envCli ] -pShelleyBasedMary :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedMary :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedMary envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraMary) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraMary) $ mconcat [Opt.long "mary-era", Opt.help "Specify the Mary era"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraMary) + $ mfilter (== AnyEraInEon ShelleyBasedEraMary) $ envCliAnyShelleyBasedEra envCli ] -pShelleyBasedAlonzo :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedAlonzo :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedAlonzo envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraAlonzo) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraAlonzo) $ mconcat [Opt.long "alonzo-era", Opt.help "Specify the Alonzo era"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraAlonzo) + $ mfilter (== AnyEraInEon ShelleyBasedEraAlonzo) $ envCliAnyShelleyBasedEra envCli ] -pShelleyBasedBabbage :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedBabbage :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedBabbage envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraBabbage) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraBabbage) $ mconcat [Opt.long "babbage-era", Opt.help "Specify the Babbage era (default)"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraBabbage) + $ mfilter (== AnyEraInEon ShelleyBasedEraBabbage) $ envCliAnyShelleyBasedEra envCli ] -pShelleyBasedConway :: EnvCli -> Parser AnyShelleyBasedEra +pShelleyBasedConway :: EnvCli -> Parser (AnyEraInEon ShelleyBasedEra) pShelleyBasedConway envCli = asum $ mconcat - [ [ Opt.flag' (AnyShelleyBasedEra ShelleyBasedEraConway) + [ [ Opt.flag' (AnyEraInEon ShelleyBasedEraConway) $ mconcat [Opt.long "conway-era", Opt.help "Specify the Conway era"] ] , maybeToList $ fmap pure - $ mfilter (== AnyShelleyBasedEra ShelleyBasedEraConway) + $ mfilter (== AnyEraInEon ShelleyBasedEraConway) $ envCliAnyShelleyBasedEra envCli ] diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs index 2014204e37..09ac10b52a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance.hs @@ -44,7 +44,7 @@ pGovernanceCmds era envCli = pCreateMirCertificatesCmds :: CardanoEra era -> Maybe (Parser (GovernanceCmds era)) pCreateMirCertificatesCmds era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "create-mir-certificate" $ Opt.info (pMIRPayStakeAddresses w <|> mirCertParsers w) 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 9627cbeef4..3c36629a2a 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -43,7 +43,7 @@ pGovernanceActionNewInfoCmd :: CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionNewInfoCmd era = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "create-info" $ Opt.info @@ -63,7 +63,7 @@ pGovernanceActionNewConstitutionCmd :: CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionNewConstitutionCmd era = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "create-constitution" $ Opt.info @@ -85,7 +85,7 @@ pGovernanceActionNewCommitteeCmd :: CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionNewCommitteeCmd era = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "create-new-committee" $ Opt.info @@ -116,7 +116,7 @@ pGovernanceActionNoConfidenceCmd :: CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionNoConfidenceCmd era = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "create-no-confidence" $ Opt.info @@ -145,7 +145,7 @@ pGovernanceActionProtocolParametersUpdateCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionProtocolParametersUpdateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "create-protocol-parameters-update" $ Opt.info @@ -280,7 +280,7 @@ dpGovActionProtocolParametersUpdate = \case pGovernanceActionTreasuryWithdrawalCmd :: CardanoEra era -> Maybe (Parser (GovernanceActionCmds era)) pGovernanceActionTreasuryWithdrawalCmd era = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "create-treasury-withdrawal" $ Opt.info diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs index 8ab2f8212a..71d91c1c76 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Committee.hs @@ -33,7 +33,7 @@ pGovernanceCommitteeKeyGenColdCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceCommitteeCmds era)) pGovernanceCommitteeKeyGenColdCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-gen-cold" $ Opt.info (pCmd w) @@ -54,7 +54,7 @@ pGovernanceCommitteeKeyGenHotCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceCommitteeCmds era)) pGovernanceCommitteeKeyGenHotCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-gen-hot" $ Opt.info (pCmd w) @@ -75,7 +75,7 @@ pGovernanceCommitteeKeyHashCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceCommitteeCmds era)) pGovernanceCommitteeKeyHashCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-hash" $ Opt.info @@ -91,7 +91,7 @@ pGovernanceCommitteeCreateHotKeyAuthorizationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceCommitteeCmds era)) pGovernanceCommitteeCreateHotKeyAuthorizationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "create-hot-key-authorization-certificate" $ Opt.info @@ -109,7 +109,7 @@ pGovernanceCommitteeCreateColdKeyResignationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceCommitteeCmds era)) pGovernanceCommitteeCreateColdKeyResignationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "create-cold-key-resignation-certificate" $ Opt.info diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs index f238e5732a..98df4e65ea 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/DRep.hs @@ -42,7 +42,7 @@ pGovernanceDRepKeyGenCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceDRepCmds era)) pGovernanceDRepKeyGenCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-gen" $ Opt.info @@ -56,7 +56,7 @@ pGovernanceDRepKeyIdCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceDRepCmds era)) pGovernanceDRepKeyIdCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "id" $ Opt.info @@ -85,7 +85,7 @@ pRegistrationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceDRepCmds era)) pRegistrationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "registration-certificate" $ Opt.info (mkParser w) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Query.hs index 941b3397cb..d47eb8e0c0 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Query.hs @@ -33,7 +33,7 @@ pGovernanceQueryGetConstitutionCmd :: () -> EnvCli -> Maybe (Parser (GovernanceQueryCmds era)) pGovernanceQueryGetConstitutionCmd era env = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "constitution" $ Opt.info (GovernanceQueryConstitutionCmd cOn <$> pNoArgQueryCmd env) @@ -44,7 +44,7 @@ pGovernanceQueryGetGovStateCmd :: () -> EnvCli -> Maybe (Parser (GovernanceQueryCmds era)) pGovernanceQueryGetGovStateCmd era env = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "gov-state" $ Opt.info (GovernanceQueryGovStateCmd cOn <$> pNoArgQueryCmd env) @@ -60,7 +60,7 @@ pGovernanceQueryDRepStateCmd :: () -> EnvCli -> Maybe (Parser (GovernanceQueryCmds era)) pGovernanceQueryDRepStateCmd era env = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "drep-state" $ Opt.info (GovernanceQueryDRepStateCmd cOn <$> pDRepStateQueryCmd) @@ -79,7 +79,7 @@ pGovernanceQueryDRepStakeDistributionCmd :: () -> EnvCli -> Maybe (Parser (GovernanceQueryCmds era)) pGovernanceQueryDRepStakeDistributionCmd era env = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "drep-stake-distribution" $ Opt.info (GovernanceQueryDRepStakeDistributionCmd cOn <$> pDRepStakeDistributionQueryCmd) @@ -98,7 +98,7 @@ pGovernanceQueryGetCommitteeStateCmd :: () -> EnvCli -> Maybe (Parser (GovernanceQueryCmds era)) pGovernanceQueryGetCommitteeStateCmd era env = do - cOn <- maybeEonInEra era + cOn <- forEraMaybeEon era pure $ subParser "committee-state" $ Opt.info (GovernanceQueryCommitteeStateCmd cOn <$> pNoArgQueryCmd env) diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs index a3c8b54658..4c286afbb4 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Vote.hs @@ -32,7 +32,7 @@ pGovernanceVoteCreateCmd :: () => CardanoEra era -> Maybe (Parser (GovernanceVoteCmds era)) pGovernanceVoteCreateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "create" $ Opt.info diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs index 309a243029..be0d1a6ec3 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs @@ -39,7 +39,7 @@ pStakeAddressKeyGenCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressKeyGenCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-gen" $ Opt.info @@ -54,7 +54,7 @@ pStakeAddressKeyHashCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressKeyHashCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "key-hash" $ Opt.info @@ -69,7 +69,7 @@ pStakeAddressBuildCmd :: () -> EnvCli -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressBuildCmd era envCli = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "build" $ Opt.info @@ -84,7 +84,7 @@ pStakeAddressRegistrationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressRegistrationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "registration-certificate" $ Opt.info @@ -99,7 +99,7 @@ pStakeAddressDeregistrationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressDeregistrationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "deregistration-certificate" $ Opt.info @@ -114,7 +114,7 @@ pStakeAddressStakeDelegationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressStakeDelegationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "stake-delegation-certificate" $ Opt.info @@ -133,7 +133,7 @@ pStakeAddressStakeAndVoteDelegationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressStakeAndVoteDelegationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "stake-and-vote-delegation-certificate" $ Opt.info @@ -153,7 +153,7 @@ pStakeAddressVoteDelegationCertificateCmd :: () => CardanoEra era -> Maybe (Parser (StakeAddressCmds era)) pStakeAddressVoteDelegationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "vote-delegation-certificate" $ Opt.info diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs index 2a019776ce..7625a641e3 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakePool.hs @@ -57,7 +57,7 @@ pStakePoolMetadataHashCmd = pStakePoolRegistrationCertificateCmd :: CardanoEra era -> EnvCli -> Maybe (Parser (StakePoolCmds era)) pStakePoolRegistrationCertificateCmd era envCli = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "registration-certificate" $ Opt.info @@ -78,7 +78,7 @@ pStakePoolRegistrationCertificateCmd era envCli = do pStakePoolDeregistrationCertificateCmd :: CardanoEra era -> Maybe (Parser (StakePoolCmds era)) pStakePoolDeregistrationCertificateCmd era = do - w <- maybeEonInEra era + w <- forEraMaybeEon era pure $ subParser "deregistration-certificate" $ Opt.info diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index dc6c0b9450..e40774de03 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -203,17 +203,15 @@ runTxBuildCmd let filteredTxinsc = Set.toList $ Set.fromList txinsc -- We need to construct the txBodycontent outside of runTxBuild - BalancedTxBody txBodycontent balancedTxBody _ _ <- + BalancedTxBody txBodyContent balancedTxBody _ _ <- runTxBuild era socketPath consensusModeParams nid mScriptValidity inputsAndMaybeScriptWits readOnlyRefIns filteredTxinsc mReturnCollateral mTotCollateral txOuts changeAddr valuesWithScriptWits mLowBound mUpperBound certsAndMaybeScriptWits withdrawalsAndMaybeScriptWits requiredSigners txAuxScripts txMetadata mProp mOverrideWits votes proposals outputOptions - mScriptWits <- - case cardanoEraStyle era of - LegacyByronEra -> return [] - ShelleyBasedEra sbe -> return $ collectTxBodyScriptWitnesses sbe txBodycontent + let mScriptWits = + forEraInEon era [] $ \sbe -> collectTxBodyScriptWitnesses sbe txBodyContent let allReferenceInputs = getAllReferenceInputs inputsAndMaybeScriptWits @@ -230,7 +228,7 @@ runTxBuildCmd -- the script cost vs having to build the tx body each time case outputOptions of OutputScriptCostOnly fp -> do - let BuildTxWith mTxProtocolParams = txProtocolParams txBodycontent + let BuildTxWith mTxProtocolParams = txProtocolParams txBodyContent pparams <- pure mTxProtocolParams & onNothing (left TxCmdProtocolParametersNotPresentInTxBody) executionUnitPrices <- pure (getExecutionUnitPrices era pparams) & onNothing (left TxCmdPParamExecutionUnitsNotAvailable) @@ -595,8 +593,8 @@ runTxBuild , txUpdateProposal = validatedTxUpProp , txMintValue = validatedMintValue , txScriptValidity = validatedTxScriptValidity - , txProposalProcedures = inEraEonMaybe era (`Featured` validatedTxProposalProcedures) - , txVotingProcedures = inEraEonMaybe era (`Featured` validatedTxVotes) + , txProposalProcedures = forEraInEonMaybe era (`Featured` validatedTxProposalProcedures) + , txVotingProcedures = forEraInEonMaybe era (`Featured` validatedTxVotes) } firstExceptT TxCmdTxInsDoNotExist @@ -661,21 +659,20 @@ validateTxInsCollateral :: CardanoEra era -> [TxIn] -> Either TxCmdError (TxInsCollateral era) validateTxInsCollateral _ [] = return TxInsCollateralNone -validateTxInsCollateral era txins = - case collateralSupportedInEra era of - Nothing -> txFeatureMismatchPure era TxFeatureCollateral - Just supported -> return (TxInsCollateral supported txins) +validateTxInsCollateral era txins = do + supported <- forEraMaybeEon era + & maybe (txFeatureMismatchPure era TxFeatureCollateral) Right + pure $ TxInsCollateral supported txins validateTxInsReference :: CardanoEra era -> [TxIn] -> Either TxCmdError (TxInsReference BuildTx era) validateTxInsReference _ [] = return TxInsReferenceNone -validateTxInsReference era allRefIns = - caseByronToAlonzoOrBabbageEraOnwards - (const $ txFeatureMismatchPure era TxFeatureReferenceInputs) - (\w -> return $ TxInsReference w allRefIns) - era +validateTxInsReference era allRefIns = do + supported <- forEraMaybeEon era + & maybe (txFeatureMismatchPure era TxFeatureReferenceInputs) Right + pure $ TxInsReference supported allRefIns getAllReferenceInputs :: [(TxIn, Maybe (ScriptWitness WitCtxTxIn era))] @@ -733,24 +730,6 @@ toTxOutValueInAnyEra era val = (\w -> return (TxOutValue w val)) era --- TODO move this to cardano-api -caseAlonzoOnlyOrBabbageEraOnwards :: () - => (AlonzoEraOnly era -> a) - -> (BabbageEraOnwards era -> a) - -> AlonzoEraOnwards era - -> a -caseAlonzoOnlyOrBabbageEraOnwards l r = \case - AlonzoEraOnwardsAlonzo -> l AlonzoEraOnlyAlonzo - AlonzoEraOnwardsBabbage -> r BabbageEraOnwardsBabbage - AlonzoEraOnwardsConway -> r BabbageEraOnwardsConway - --- TODO move this to cardano-api -alonzoEraOnlyToAlonzoEraOnwards :: () - => AlonzoEraOnly era - -> AlonzoEraOnwards era -alonzoEraOnlyToAlonzoEraOnwards = \case - AlonzoEraOnlyAlonzo -> AlonzoEraOnwardsAlonzo - toTxOutInAnyEra :: CardanoEra era -> TxOutAnyEra -> ExceptT TxCmdError IO (TxOut CtxTx era) diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index 4036bb1084..e2f316119a 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -128,7 +128,7 @@ pattern ShelleyTtl :: SlotNo -> (TxValidityLowerBound era, TxValidityUpperBound era) pattern ShelleyTtl ttl <- ( TxValidityNoLowerBound - , TxValidityUpperBound ValidityUpperBoundInShelleyEra ttl + , TxValidityUpperBound _ ttl ) friendlyValidityRange @@ -151,8 +151,8 @@ friendlyValidityRange era = \case ] | otherwise -> Null where - isLowerBoundSupported = isJust $ validityLowerBoundSupportedInEra era - isUpperBoundSupported = isJust $ validityUpperBoundSupportedInEra era + isLowerBoundSupported = isJust $ inEonForEraMaybe TxValidityLowerBound era + isUpperBoundSupported = isJust $ inEonForEraMaybe TxValidityUpperBound era friendlyWithdrawals :: TxWithdrawals ViewTx era -> Aeson.Value friendlyWithdrawals TxWithdrawalsNone = Null diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs index f992246456..de02b24a27 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Governance.hs @@ -14,18 +14,18 @@ import Data.Text (Text) data LegacyGovernanceCmds = GovernanceMIRPayStakeAddressesCertificate - AnyShelleyToBabbageEra + (AnyEraInEon ShelleyToBabbageEra) MIRPot [StakeAddress] [Lovelace] (File () Out) | GovernanceMIRTransfer - AnyShelleyToBabbageEra + (AnyEraInEon ShelleyToBabbageEra) Lovelace (File () Out) TransferDirection | GovernanceGenesisKeyDelegationCertificate - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) (VerificationKeyOrHashOrFile GenesisKey) (VerificationKeyOrHashOrFile GenesisDelegateKey) (VerificationKeyOrHashOrFile VrfKey) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakeAddress.hs index 00d33d86be..f5b665f3bc 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakeAddress.hs @@ -29,17 +29,17 @@ data LegacyStakeAddressCmds NetworkId (Maybe (File () Out)) | StakeAddressRegistrationCertificateCmd - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) StakeIdentifier (Maybe Lovelace) (File () Out) | StakeAddressDelegationCertificateCmd - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) StakeIdentifier (VerificationKeyOrHashOrFile StakePoolKey) (File () Out) | StakeAddressDeregistrationCertificateCmd - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) StakeIdentifier (Maybe Lovelace) (File () Out) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakePool.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakePool.hs index 9824f098cb..453176cef4 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Commands/StakePool.hs @@ -17,7 +17,7 @@ import Data.Text (Text) data LegacyStakePoolCmds = StakePoolDeregistrationCertificateCmd - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) -- ^ Era in which to retire the stake pool. (VerificationKeyOrFile StakePoolKey) -- ^ Stake pool verification key. @@ -32,7 +32,7 @@ data LegacyStakePoolCmds (StakePoolMetadataFile In) (Maybe (File () Out)) | StakePoolRegistrationCertificateCmd - AnyShelleyBasedEra + (AnyEraInEon ShelleyBasedEra) -- ^ Era in which to register the stake pool. (VerificationKeyOrFile StakePoolKey) -- ^ Stake pool verification key. diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs index f27e4d78fa..5ea8b4df51 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs @@ -1463,5 +1463,6 @@ pLegacyCardanoEra envCli = , pure $ pure defaultCardanoEra ] where - defaultCardanoEra = defaultShelleyBasedEra & \(AnyShelleyBasedEra era) -> - AnyCardanoEra (shelleyBasedToCardanoEra era) + defaultCardanoEra = defaultShelleyBasedEra & \(AnyEraInEon era) -> + let cera = toCardanoEra era + in cardanoEraConstraints cera (AnyCardanoEra cera) diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs index 7e4f1e05a7..21e896cf31 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/Governance.hs @@ -56,32 +56,32 @@ runLegacyGovernanceCmds = \case runLegacyGovernanceVerifyPoll poll metadata mOutFile runLegacyGovernanceMIRCertificatePayStakeAddrs - :: AnyShelleyToBabbageEra + :: AnyEraInEon ShelleyToBabbageEra -> Ledger.MIRPot -> [StakeAddress] -- ^ Stake addresses -> [Lovelace] -- ^ Corresponding reward amounts (same length) -> File () Out -> ExceptT GovernanceCmdError IO () -runLegacyGovernanceMIRCertificatePayStakeAddrs (AnyShelleyToBabbageEra w) = +runLegacyGovernanceMIRCertificatePayStakeAddrs (AnyEraInEon w) = runGovernanceMIRCertificatePayStakeAddrs w runLegacyGovernanceMIRCertificateTransfer - :: AnyShelleyToBabbageEra + :: AnyEraInEon ShelleyToBabbageEra -> Lovelace -> File () Out -> TransferDirection -> ExceptT GovernanceCmdError IO () -runLegacyGovernanceMIRCertificateTransfer (AnyShelleyToBabbageEra w) = +runLegacyGovernanceMIRCertificateTransfer (AnyEraInEon w) = runGovernanceMIRCertificateTransfer w runLegacyGovernanceGenesisKeyDelegationCertificate - :: AnyShelleyBasedEra + :: AnyEraInEon ShelleyBasedEra -> VerificationKeyOrHashOrFile GenesisKey -> VerificationKeyOrHashOrFile GenesisDelegateKey -> VerificationKeyOrHashOrFile VrfKey -> File () Out -> ExceptT GovernanceCmdError IO () -runLegacyGovernanceGenesisKeyDelegationCertificate (AnyShelleyBasedEra sbe) +runLegacyGovernanceGenesisKeyDelegationCertificate (AnyEraInEon sbe) genVkOrHashOrFp genDelVkOrHashOrFp vrfVkOrHashOrFp @@ -102,6 +102,7 @@ runLegacyGovernanceGenesisKeyDelegationCertificate (AnyShelleyBasedEra sbe) firstExceptT GovernanceCmdTextEnvWriteError . newExceptT $ writeLazyByteStringFile oFp + $ shelleyBasedEraConstraints sbe $ textEnvelopeToJSON (Just genKeyDelegCertDesc) genKeyDelegCert where genKeyDelegCertDesc :: TextEnvelopeDescr diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/StakeAddress.hs index c537e57ee2..a1e06d244c 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/StakeAddress.hs @@ -57,16 +57,16 @@ runLegacyStakeAddressBuildCmd = runStakeAddressBuildCmd runLegacyStakeAddressRegistrationCertificateCmd :: () - => AnyShelleyBasedEra + => AnyEraInEon ShelleyBasedEra -> StakeIdentifier -> Maybe Lovelace -- ^ Deposit required in conway era -> File () Out -> ExceptT StakeAddressCmdError IO () -runLegacyStakeAddressRegistrationCertificateCmd (AnyShelleyBasedEra sbe) = +runLegacyStakeAddressRegistrationCertificateCmd (AnyEraInEon sbe) = runStakeAddressRegistrationCertificateCmd sbe runLegacyStakeAddresslDelegationCertificateCmd :: () - => AnyShelleyBasedEra + => AnyEraInEon ShelleyBasedEra -> StakeIdentifier -- ^ Delegator stake verification key, verification key file or script file. -> VerificationKeyOrHashOrFile StakePoolKey @@ -74,14 +74,14 @@ runLegacyStakeAddresslDelegationCertificateCmd :: () -- verification key hash. -> File () Out -> ExceptT StakeAddressCmdError IO () -runLegacyStakeAddresslDelegationCertificateCmd (AnyShelleyBasedEra sbe) = +runLegacyStakeAddresslDelegationCertificateCmd (AnyEraInEon sbe) = runStakeAddressStakeDelegationCertificateCmd sbe runLegacyStakeAddressDeregistrationCertificateCmd :: () - => AnyShelleyBasedEra + => AnyEraInEon ShelleyBasedEra -> StakeIdentifier -> Maybe Lovelace -- ^ Deposit required in conway era -> File () Out -> ExceptT StakeAddressCmdError IO () -runLegacyStakeAddressDeregistrationCertificateCmd (AnyShelleyBasedEra sbe) = +runLegacyStakeAddressDeregistrationCertificateCmd (AnyEraInEon sbe) = runStakeAddressDeregistrationCertificateCmd sbe diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/StakePool.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/StakePool.hs index 61044cdf3f..841113972a 100644 --- a/cardano-cli/src/Cardano/CLI/Legacy/Run/StakePool.hs +++ b/cardano-cli/src/Cardano/CLI/Legacy/Run/StakePool.hs @@ -35,7 +35,7 @@ runLegacyStakePoolCmds = \case -- TODO: Metadata and more stake pool relay support to be -- added in the future. runLegacyStakePoolRegistrationCertificateCmd :: () - => AnyShelleyBasedEra + => AnyEraInEon ShelleyBasedEra -> VerificationKeyOrFile StakePoolKey -- ^ Stake pool verification key. -> VerificationKeyOrFile VrfKey @@ -58,17 +58,17 @@ runLegacyStakePoolRegistrationCertificateCmd :: () -> File () Out -> ExceptT StakePoolCmdError IO () runLegacyStakePoolRegistrationCertificateCmd = \case - AnyShelleyBasedEra sbe -> + AnyEraInEon sbe -> runStakePoolRegistrationCertificateCmd sbe runLegacyStakePoolDeregistrationCertificateCmd :: () - => AnyShelleyBasedEra + => AnyEraInEon ShelleyBasedEra -> VerificationKeyOrFile StakePoolKey -> Shelley.EpochNo -> File () Out -> ExceptT StakePoolCmdError IO () runLegacyStakePoolDeregistrationCertificateCmd = \case - AnyShelleyBasedEra sbe -> + AnyEraInEon sbe -> runStakePoolRetirementCertificateCmd sbe runLegacyStakePoolIdCmd :: () diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index 65e186e8ed..ca5491fc8f 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -176,7 +176,7 @@ readTxMetadata :: CardanoEra era -> IO (Either MetadataError (TxMetadataInEra era)) readTxMetadata _ _ [] = return $ Right TxMetadataNone readTxMetadata era schema files = cardanoEraConstraints era $ runExceptT $ do - supported <- maybeEonInEra era + supported <- forEraMaybeEon era & hoistMaybe (MetadataErrorNotAvailableInEra $ AnyCardanoEra era) metadata <- mapM (readFileTxMetadata schema) files pure $ TxMetadataInEra supported $ mconcat metadata @@ -796,7 +796,7 @@ readTxGovernanceActions -> IO (Either ConstitutionError [Proposal era]) readTxGovernanceActions _ [] = return $ Right [] readTxGovernanceActions era files = runExceptT $ do - w <- maybeEonInEra era + w <- forEraMaybeEon era & hoistMaybe (ConstitutionNotSupportedInEra $ cardanoEraConstraints era $ AnyCardanoEra era) newExceptT $ sequence <$> mapM (readProposal w) files diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs index 8de937f6b0..cc5ab81f7e 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/StakeAddressDelegationError.hs @@ -1,6 +1,5 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE ScopedTypeVariables #-} -{-# LANGUAGE TypeApplications #-} module Cardano.CLI.Types.Errors.StakeAddressDelegationError ( StakeAddressDelegationError(..) @@ -10,12 +9,11 @@ import Cardano.Api import qualified Data.Text as Text -newtype StakeAddressDelegationError = VoteDelegationNotSupported AnyShelleyToBabbageEra deriving Show +newtype StakeAddressDelegationError = VoteDelegationNotSupported (AnyEraInEon ShelleyToBabbageEra) deriving Show instance Error StakeAddressDelegationError where displayError = \case - VoteDelegationNotSupported (AnyShelleyToBabbageEra stbe) -> "Vote delegation not supported in " <> eraTxt stbe <> " era." + VoteDelegationNotSupported (AnyEraInEon eraInEon) -> "Vote delegation not supported in " <> eraTxt <> " era." where - eraTxt :: forall era. ShelleyToBabbageEra era -> String - eraTxt stbe' = shelleyToBabbageEraConstraints stbe' $ - Text.unpack . renderEra $ AnyCardanoEra (cardanoEra @era) + cEra = toCardanoEra eraInEon + eraTxt = cardanoEraConstraints cEra $ Text.unpack . renderEra $ AnyCardanoEra cEra diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs index 068a634b45..952870dfe9 100644 --- a/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs +++ b/cardano-cli/src/Cardano/CLI/Types/Errors/TxValidationError.hs @@ -6,6 +6,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE RankNTypes #-} {-# LANGUAGE ScopedTypeVariables #-} +{-# LANGUAGE TypeApplications #-} module Cardano.CLI.Types.Errors.TxValidationError ( TxAuxScriptsValidationError(..) @@ -41,7 +42,6 @@ import Cardano.Api.Shelley import Prelude import Data.Bifunctor (first) -import Data.Function import qualified Data.Map.Strict as Map import Data.Maybe import qualified Data.Text as Text @@ -104,12 +104,9 @@ validateTxTotalCollateral :: CardanoEra era -> Maybe Lovelace -> Either TxTotalCollateralValidationError (TxTotalCollateral era) validateTxTotalCollateral _ Nothing = return TxTotalCollateralNone -validateTxTotalCollateral era (Just coll) = - case totalAndReturnCollateralSupportedInEra era of - Just supp -> return $ TxTotalCollateral supp coll - Nothing -> Left $ TxTotalCollateralNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era +validateTxTotalCollateral era (Just coll) = do + supported <- conjureWitness era TxTotalCollateralNotSupported + pure $ TxTotalCollateral supported coll newtype TxReturnCollateralValidationError = TxReturnCollateralNotSupported AnyCardanoEra @@ -124,11 +121,8 @@ validateTxReturnCollateral :: CardanoEra era -> Either TxReturnCollateralValidationError (TxReturnCollateral CtxTx era) validateTxReturnCollateral _ Nothing = return TxReturnCollateralNone validateTxReturnCollateral era (Just retColTxOut) = do - case totalAndReturnCollateralSupportedInEra era of - Just supp -> return $ TxReturnCollateral supp retColTxOut - Nothing -> Left $ TxReturnCollateralNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era + supported <- conjureWitness era TxReturnCollateralNotSupported + pure $ TxReturnCollateral supported retColTxOut newtype TxValidityLowerBoundValidationError = TxValidityLowerBoundNotSupported AnyCardanoEra @@ -143,12 +137,9 @@ validateTxValidityLowerBound :: CardanoEra era -> Maybe SlotNo -> Either TxValidityLowerBoundValidationError (TxValidityLowerBound era) validateTxValidityLowerBound _ Nothing = return TxValidityNoLowerBound -validateTxValidityLowerBound era (Just slot) = - case validityLowerBoundSupportedInEra era of - Nothing -> Left $ TxValidityLowerBoundNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> return (TxValidityLowerBound supported slot) +validateTxValidityLowerBound era (Just slot) = do + supported <- conjureWitness era TxValidityLowerBoundNotSupported + pure $ TxValidityLowerBound supported slot newtype TxValidityUpperBoundValidationError = TxValidityUpperBoundNotSupported AnyCardanoEra @@ -162,18 +153,13 @@ validateTxValidityUpperBound :: CardanoEra era -> Maybe SlotNo -> Either TxValidityUpperBoundValidationError (TxValidityUpperBound era) -validateTxValidityUpperBound era Nothing = - case validityNoUpperBoundSupportedInEra era of - Nothing -> Left $ TxValidityUpperBoundNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> return (TxValidityNoUpperBound supported) -validateTxValidityUpperBound era (Just slot) = - case validityUpperBoundSupportedInEra era of - Nothing -> Left $ TxValidityUpperBoundNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> return (TxValidityUpperBound supported slot) +validateTxValidityUpperBound era = \case + Just slot -> do + supported <- conjureWitness era TxValidityUpperBoundNotSupported + pure $ TxValidityUpperBound supported slot + Nothing -> do + supported <- conjureWitness era TxValidityUpperBoundNotSupported + pure $ TxValidityNoUpperBound supported data TxAuxScriptsValidationError = TxAuxScriptsNotSupportedInEra AnyCardanoEra @@ -191,14 +177,10 @@ validateTxAuxScripts -> [ScriptInAnyLang] -> Either TxAuxScriptsValidationError (TxAuxScripts era) validateTxAuxScripts _ [] = return TxAuxScriptsNone -validateTxAuxScripts era scripts = - case auxScriptsSupportedInEra era of - Nothing -> Left $ TxAuxScriptsNotSupportedInEra - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> do - scriptsInEra <- mapM (first TxAuxScriptsLanguageError . validateScriptSupportedInEra era) scripts - return $ TxAuxScripts supported scriptsInEra +validateTxAuxScripts era scripts = do + supported <- conjureWitness era TxAuxScriptsNotSupportedInEra + scriptsInEra <- mapM (first TxAuxScriptsLanguageError . validateScriptSupportedInEra era) scripts + pure $ TxAuxScripts supported scriptsInEra newtype TxRequiredSignersValidationError = TxRequiredSignersValidationError AnyCardanoEra @@ -213,12 +195,9 @@ validateRequiredSigners -> [Hash PaymentKey] -> Either TxRequiredSignersValidationError (TxExtraKeyWitnesses era) validateRequiredSigners _ [] = return TxExtraKeyWitnessesNone -validateRequiredSigners era reqSigs = - case extraKeyWitnessesSupportedInEra era of - Nothing -> Left $ TxRequiredSignersValidationError - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> return $ TxExtraKeyWitnesses supported reqSigs +validateRequiredSigners era reqSigs = do + supported <- conjureWitness era TxRequiredSignersValidationError + pure $ TxExtraKeyWitnesses supported reqSigs newtype TxWithdrawalsValidationError = TxWithdrawalsNotSupported AnyCardanoEra @@ -235,8 +214,7 @@ validateTxWithdrawals -> Either TxWithdrawalsValidationError (TxWithdrawals BuildTx era) validateTxWithdrawals _ [] = return TxWithdrawalsNone validateTxWithdrawals era withdrawals = do - supported <- maybeEonInEra era - & maybe (cardanoEraConstraints era $ Left . TxWithdrawalsNotSupported $ AnyCardanoEra era) Right + supported <- conjureWitness era TxWithdrawalsNotSupported let convWithdrawals = map convert withdrawals pure $ TxWithdrawals supported convWithdrawals where @@ -264,8 +242,7 @@ validateTxCertificates -> Either TxCertificatesValidationError (TxCertificates BuildTx era) validateTxCertificates _ [] = return TxCertificatesNone validateTxCertificates era certsAndScriptWitnesses = cardanoEraConstraints era $ do - supported <- maybeEonInEra era - & maybe (Left . TxCertificatesValidationNotSupported $ AnyCardanoEra era) Right + supported <- conjureWitness era TxCertificatesValidationNotSupported let certs = map fst certsAndScriptWitnesses reqWits = Map.fromList $ mapMaybe convert certsAndScriptWitnesses pure $ TxCertificates supported certs $ BuildTxWith reqWits @@ -308,12 +285,9 @@ validateProtocolParameters -> Maybe (LedgerProtocolParameters era) -> Either TxProtocolParametersValidationError (BuildTxWith BuildTx (Maybe (LedgerProtocolParameters era))) validateProtocolParameters _ Nothing = return (BuildTxWith Nothing) -validateProtocolParameters era (Just pparams) = - case cardanoEraStyle era of - LegacyByronEra -> Left $ ProtocolParametersNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era - ShelleyBasedEra _ -> return . BuildTxWith $ Just pparams +validateProtocolParameters era (Just pparams) = do + _ <- conjureWitness @ShelleyBasedEra era ProtocolParametersNotSupported + pure . BuildTxWith $ Just pparams newtype TxUpdateProposalValidationError = TxUpdateProposalNotSupported AnyCardanoEra @@ -329,8 +303,7 @@ validateTxUpdateProposal -> Either TxUpdateProposalValidationError (TxUpdateProposal era) validateTxUpdateProposal _ Nothing = return TxUpdateProposalNone validateTxUpdateProposal era (Just prop) = do - supported <- maybeEonInEra era - & maybe (cardanoEraConstraints era $ Left . TxUpdateProposalNotSupported $ AnyCardanoEra era) Right + supported <- conjureWitness era TxUpdateProposalNotSupported pure $ TxUpdateProposal supported prop newtype TxScriptValidityValidationError @@ -346,9 +319,15 @@ validateTxScriptValidity -> Maybe ScriptValidity -> Either TxScriptValidityValidationError (TxScriptValidity era) validateTxScriptValidity _ Nothing = pure TxScriptValidityNone -validateTxScriptValidity era (Just scriptValidity) = - case txScriptValiditySupportedInCardanoEra era of - Nothing -> Left $ ScriptValidityNotSupported - $ cardanoEraConstraints era - $ AnyCardanoEra era - Just supported -> pure $ TxScriptValidity supported scriptValidity +validateTxScriptValidity era (Just scriptValidity) = do + supported <- conjureWitness era ScriptValidityNotSupported + pure $ TxScriptValidity supported scriptValidity + + +conjureWitness :: Eon eon + => CardanoEra era -- ^ era to try to conjure eon from + -> (AnyCardanoEra -> e) -- ^ error wrapper function + -> Either e (eon era) -- ^ eon if it includes the era, an error otherwise +conjureWitness era errF = + maybe (cardanoEraConstraints era $ Left . errF $ AnyCardanoEra era) Right $ + forEraMaybeEon era diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out b/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out index b4a82f94d2..8fe812eff0 100644 --- a/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out +++ b/cardano-cli/test/cardano-cli-golden/files/golden/allegra/transaction-view.out @@ -22,6 +22,5 @@ return collateral: null total collateral: null update proposal: null validity range: - lower bound: null - upper bound: 101 + time to live: 101 withdrawals: null diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/verification.key b/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/verification.key deleted file mode 100644 index 6d7ec63397..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/alonzo/verification.key +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "PaymentVerificationKeyShelley_ed25519", - "description": "Payment Verification Key", - "cborHex": "582084ce03e08b05533685d593c14cd6ca5c7485824156ca11fb303ddac9dd3ef41c" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_drep_registration-certificate.cli deleted file mode 100644 index e0a37cfae0..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/allegra_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli allegra governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_drep_registration-certificate.cli deleted file mode 100644 index 8628fb3685..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/alonzo_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli alonzo governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_drep_registration-certificate.cli deleted file mode 100644 index 39c1a48ccc..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/babbage_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli babbage governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli deleted file mode 100644 index 02ea9583af..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/latest_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli latest governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_drep_registration-certificate.cli deleted file mode 100644 index 6ea55bde0e..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/mary_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli mary governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_drep_registration-certificate.cli b/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_drep_registration-certificate.cli deleted file mode 100644 index 8d1cadffc0..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/help/shelley_governance_drep_registration-certificate.cli +++ /dev/null @@ -1,84 +0,0 @@ -Usage: cardano-cli shelley governance drep registration-certificate - ( ( --stake-pool-verification-key STRING - | --cold-verification-key-file FILE - ) - ( --vrf-verification-key STRING - | --vrf-verification-key-file FILE - ) - --pool-pledge LOVELACE - --pool-cost LOVELACE - --pool-margin RATIONAL - ( --pool-reward-account-verification-key STRING - | --pool-reward-account-verification-key-file FILE - ) - ( --pool-owner-verification-key STRING - | --pool-owner-stake-verification-key-file FILE - ) - [ [--pool-relay-ipv4 STRING] - [--pool-relay-ipv6 STRING] - --pool-relay-port INT - | --single-host-pool-relay STRING - [--pool-relay-port INT] - | --multi-host-pool-relay STRING - ] - [--metadata-url URL - --metadata-hash HASH] - ( --mainnet - | --testnet-magic NATURAL - ) - | --stake-verification-key STRING - | --stake-verification-key-file FILE - | --stake-script-file FILE - | --stake-address ADDRESS - ) - --out-file FILE - - Create a registration certificate. - -Available options: - --stake-pool-verification-key STRING - Stake pool verification key (Bech32 or hex-encoded). - --cold-verification-key-file FILE - Filepath of the stake pool verification key. - --vrf-verification-key STRING - VRF verification key (Bech32 or hex-encoded). - --vrf-verification-key-file FILE - Filepath of the VRF verification key. - --pool-pledge LOVELACE The stake pool's pledge. - --pool-cost LOVELACE The stake pool's cost. - --pool-margin RATIONAL The stake pool's margin. - --pool-reward-account-verification-key STRING - Reward account stake verification key (Bech32 or - hex-encoded). - --pool-reward-account-verification-key-file FILE - Filepath of the reward account stake verification - key. - --pool-owner-verification-key STRING - Pool owner stake verification key (Bech32 or - hex-encoded). - --pool-owner-stake-verification-key-file FILE - Filepath of the pool owner stake verification key. - --pool-relay-ipv4 STRING The stake pool relay's IPv4 address - --pool-relay-ipv6 STRING The stake pool relay's IPv6 address - --pool-relay-port INT The stake pool relay's port - --single-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an A or AAAA DNS record - --pool-relay-port INT The stake pool relay's port - --multi-host-pool-relay STRING - The stake pool relay's DNS name that corresponds to - an SRV DNS record - --metadata-url URL Pool metadata URL (maximum length of 64 characters). - --metadata-hash HASH Pool metadata hash. - --mainnet Use the mainnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --testnet-magic NATURAL Specify a testnet magic id. This overrides the - CARDANO_NODE_NETWORK_ID environment variable - --stake-verification-key STRING - Stake verification key (Bech32 or hex-encoded). - --stake-verification-key-file FILE - Filepath of the staking verification key. - --stake-script-file FILE Filepath of the staking script. - --stake-address ADDRESS Target stake address (bech32 format). - --out-file FILE The output file. - -h,--help Show this help text diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/genesis.conway.spec.json b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/genesis.conway.spec.json deleted file mode 100644 index 4525ef4a58..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/genesis.conway.spec.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "genDelegs": {} -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/answer/basic.json b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/answer/basic.json deleted file mode 100644 index 9bdbb2b0b8..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/answer/basic.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "94": { - "map": [ - { - "k": { - "int": 2 - }, - "v": { - "bytes": "29093fd43fc30ba31e306af06ce8537390e1668ae7496fe53d53684683c3762c" - } - }, - { - "k": { - "int": 3 - }, - "v": { - "int": 1 - } - } - ] - } -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/cold.sk b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/cold.sk deleted file mode 100644 index c766daf4dd..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/cold.sk +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "StakePoolSigningKey_ed25519", - "description": "Stake Pool Operator Signing Key", - "cborHex": "58201d298ffa1544da0a5b2ea544728fc1ba7d2ae7c60e1d37da03895019740dd00a" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/polls/long-text.json b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/polls/long-text.json deleted file mode 100644 index fe4480afea..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/polls/long-text.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "GovernancePoll", - "description": "An on-chain poll for SPOs: What is the most adequate topping to put on a pizza (please consider all possibilities and take time to answer)?", - "cborHex": "a1185ea2008278405768617420697320746865206d6f737420616465717561746520746f7070696e6720746f20707574206f6e20612070697a7a612028706c6561736520636f6e7378306964657220616c6c20706f73736962696c697469657320616e642074616b652074696d6520746f20616e73776572293f0182816a70696e656170706c65738278406f6e6c7920747261646974696f6e616c20746f706963732073686f756c6420676f206f6e20612070697a7a612c20746869732069736e277420726f6f6d20666f6772206a6f6b6573" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid deleted file mode 100644 index a8cadf462c..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/invalid +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "Tx BabbageEra", - "description": "", - "cborHex": "84a50081825820000000000000000000000000000000000000000000000000000000000000000000018002000e81581cf8db28823f8ebd01a2d9e24efb2f0d18e387665770274513e370b5d507582071c60fbdbf7a81f5c1115a45ecd2b95517f23dd820df8339323bf18ad513af17a1008182582029ade2115fbcbc17f063eec41ec0d358ccc5b52c2bccb47c0918727695619a68584043dff7946b6bbb5fc48783f18fe42ff0f3638ee539a41dff2fdae4aaf560e15073d40962b6d56e08329901e6d53b035309ea8551dc27ccc937a470d8bdd22101f5d90103a100a1185ea202582029093fd43fc30ba31e306af06ce8537390e1668ae7496fe53d53684683c3762c03182a" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed deleted file mode 100644 index 99c373b2ab..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/malformed +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "Tx BabbageEra", - "description": "", - "cborHex": "84a50081825820000000000000000000000000000000000000000000000000000000000000000000018002000e81581cf8db28823f8ebd01a2d9e24efb2f0d18e387665770274513e370b5d5075820eb050f4d211a6eb0cc26b329543d1efd10c63640ca27712effe0020eec94cf51a1008182582029ade2115fbcbc17f063eec41ec0d358ccc5b52c2bccb47c0918727695619a68584029360e6594884bc4be2d2e1e548739dd6081583e76ecfb4eb8059f293b2f8082399d0e9322e0d9218281bfdf5486b1486fb6fa9f3e9e51ec3d77300600b3fc09f5d90103a100a1185ea2623134582029093fd43fc30ba31e306af06ce8537390e1668ae7496fe53d53684683c3762c810301" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch deleted file mode 100644 index 2b830809fe..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/mismatch +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "Tx BabbageEra", - "description": "", - "cborHex": "84a50081825820000000000000000000000000000000000000000000000000000000000000000000018002000e81581cf8db28823f8ebd01a2d9e24efb2f0d18e387665770274513e370b5d5075820741abe0b22490400b7f86833095f5c9acb7fdb19794c430a9a5f88303f91fb9ea1008182582029ade2115fbcbc17f063eec41ec0d358ccc5b52c2bccb47c0918727695619a685840ba84c617c839ed4461f4d327057e31d6f36cf6e77d23538bc0b59908c665fb83c838c21009f8f48156e4f85f062fe0cd6ab7872a1caf9bc65223bb924ff8c908f5d90103a100a1185ea2025820ff093fd43fc30ba31e306af06ce8537390e1668ae7496fe53d53684683c376ff0301" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/none b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/none deleted file mode 100644 index b9d8a582d9..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/governance/verify/none +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "Tx BabbageEra", - "description": "", - "cborHex": "84a40081825820000000000000000000000000000000000000000000000000000000000000000000018002000e81581cf8db28823f8ebd01a2d9e24efb2f0d18e387665770274513e370b5d5a1008182582029ade2115fbcbc17f063eec41ec0d358ccc5b52c2bccb47c0918727695619a68584020dca762a77d32b1c9982739e3d23f979b25c6fa0bb8a06a2523e5e2334bf4c8489f9a93c8dd620b6e390c89da3ec7797a66193609a96df2c36cd0356501a307f5f6" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-calculate-min-fee/tx-body-file b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-calculate-min-fee/tx-body-file deleted file mode 100644 index e24bb7d3bc..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-calculate-min-fee/tx-body-file +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "TxUnsignedShelley", - "description": "", - "cborHex": "82a4008182582091999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c300018182581d615dbe1e2117641f8d618034b801a870ca731ce758c3bedd5c7e4429c11a05f5e100021a000f4240031a0007a120f6" -} \ No newline at end of file diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo1.skey b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo1.skey deleted file mode 100644 index 7d51acd54b..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo1.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "GenesisUTxOSigningKey_ed25519", - "description": "Genesis Initial UTxO Signing Key", - "cborHex": "5820b930f931fd32d7b78d147ec283ef7c0822df68c1a21f226d12269be47557a036" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo2.skey b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo2.skey deleted file mode 100644 index 52d0c8a5c0..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/initial-utxo2.skey +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "GenesisUTxOSigningKey_ed25519", - "description": "Genesis Initial UTxO Signing Key", - "cborHex": "58204efdf94501ac1213dc1e8f174c1d8d4f8d906757926fd7aa844efec136d014b5" -} diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/tx-body-file b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/tx-body-file deleted file mode 100644 index e24bb7d3bc..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/transaction-sign/tx-body-file +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "TxUnsignedShelley", - "description": "", - "cborHex": "82a4008182582091999ea21177b33ebe6b8690724a0c026d410a11ad7521caa350abdafa5394c300018182581d615dbe1e2117641f8d618034b801a870ca731ce758c3bedd5c7e4429c11a05f5e100021a000f4240031a0007a120f6" -} \ No newline at end of file diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/tx/tx b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/tx/tx deleted file mode 100644 index 3f807180fc..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/tx/tx +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "Witnessed Tx AlonzoEra", - "description": "Ledger Cddl Format", - "cborHex": "84a30081825820256fe89fc62e787e470c54e6d17390309ed6ceed27f11b9f873dd55802a6272f0001828258390076619da7963eaa588252c45e960667a4647eed69135f51f5a10f2888d2c20ac07056fc8899c47d825cefd9dcf5efba150236e043262e2b431b0000011764f7be0782581d604088059bbeb6add02eecd0c6a2a52c06910f2a6b4ba0029e9fe6ed131a00989680021a00028b79a100818258206cf237caaf3218032c28fe858aaeeb835a8b315f45ec273970fb64b3dd1cc7dc58402271384dc35dc926468747e901aba167d03f17d1f01374f8631210af32b2dfb601d4949bd9e03158473493425a31db653a3de8460510c5da92ff01022eecc801f5f6" -} \ No newline at end of file diff --git a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/update-proposal b/cardano-cli/test/cardano-cli-golden/files/golden/shelley/update-proposal deleted file mode 100644 index 93e7aef6f3..0000000000 --- a/cardano-cli/test/cardano-cli-golden/files/golden/shelley/update-proposal +++ /dev/null @@ -1,5 +0,0 @@ -{ - "type": "UpdateProposalShelley", - "description": "", - "cborHex": "82a1581ca2512fa96a5f51d7aa8b8558669561fdd905f505ad7e0f4047b15c9eb100197a6601197a6702197a6e03197a6804197a6d05197a6406197a6307197a6108197a6009d81e82197a5f1903e80ad81e82197a5b1a000186a00bd81e82197a591a000186a00cd81e82197a6f1a000186a00d82015820ee32869218e317d16b9cba9e8f0737e23a6c9328e71068f161e5cc3cf54c45be0e82197a6a197a6b0f197a6510197a62197a69" -} diff --git a/flake.lock b/flake.lock index 35475114bc..64d1bf1a8a 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1695809408, - "narHash": "sha256-3RLFxpAhvZGPq+K0MrHOC46eFeXTfMevxWYHTCY8kpo=", + "lastModified": 1696197224, + "narHash": "sha256-dLz7+qtfK92aA6oW5Ybz+ybhZW34La9etWDr6GNWlBg=", "owner": "input-output-hk", "repo": "cardano-haskell-packages", - "rev": "1198d4af66ccbdf2d744bdd705f1a7af6be5effb", + "rev": "ffb9ee2dfbf65c4b41d750021c04be3b9b76952c", "type": "github" }, "original": {