From bbbd8b4c390aa5d9dc2dbe23965a67c572edcdc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Fri, 15 Nov 2024 10:28:53 +0100 Subject: [PATCH 1/2] Use new inject function instead of the XToY era functions --- .../src/Cardano/CLI/Compatible/Transaction.hs | 6 ++-- .../EraBased/Options/Governance/Actions.hs | 8 ++--- .../src/Cardano/CLI/EraBased/Options/Query.hs | 4 +-- .../CLI/EraBased/Options/StakeAddress.hs | 4 +-- .../CLI/EraBased/Options/Transaction.hs | 2 +- .../Cardano/CLI/EraBased/Run/Governance.hs | 15 +++++---- .../CLI/EraBased/Run/Governance/Actions.hs | 31 ++++++++++--------- .../GenesisKeyDelegationCertificate.hs | 6 ++-- .../CLI/EraBased/Run/Governance/Vote.hs | 8 ++--- .../Cardano/CLI/EraBased/Run/Transaction.hs | 6 ++-- cardano-cli/src/Cardano/CLI/Json/Friendly.hs | 4 +-- cardano-cli/src/Cardano/CLI/Read.hs | 4 +-- 12 files changed, 52 insertions(+), 46 deletions(-) diff --git a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs index 8c3cc9d2c4..a1ffb8cee0 100644 --- a/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/Compatible/Transaction.hs @@ -270,18 +270,18 @@ readUpdateProposalFile :: Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile) -> ExceptT CompatibleTransactionError IO (AnyProtocolUpdate era) readUpdateProposalFile (Featured sToB Nothing) = - return $ NoPParamsUpdate $ shelleyToBabbageEraToShelleyBasedEra sToB + return $ NoPParamsUpdate $ inject sToB readUpdateProposalFile (Featured sToB (Just updateProposalFile)) = do prop <- firstExceptT CompatibleFileError $ readTxUpdateProposal sToB updateProposalFile case prop of - TxUpdateProposalNone -> return $ NoPParamsUpdate $ shelleyToBabbageEraToShelleyBasedEra sToB + TxUpdateProposalNone -> return $ NoPParamsUpdate $ inject sToB TxUpdateProposal _ proposal -> return $ ProtocolUpdate sToB proposal readProposalProcedureFile :: Featured ConwayEraOnwards era [(ProposalFile In, Maybe (ScriptWitnessFiles WitCtxStake))] -> ExceptT CompatibleTransactionError IO (AnyProtocolUpdate era) readProposalProcedureFile (Featured cEraOnwards []) = - let sbe = conwayEraOnwardsToShelleyBasedEra cEraOnwards + let sbe = inject cEraOnwards in return $ NoPParamsUpdate sbe readProposalProcedureFile (Featured cEraOnwards proposals) = do props <- 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 69efca1e4d..d0c3244542 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Governance/Actions.hs @@ -185,11 +185,11 @@ pUpdateProtocolParametersCmd pUpdateProtocolParametersCmd = caseShelleyToBabbageOrConwayEraOnwards ( \shelleyToBab -> - let sbe = shelleyToBabbageEraToShelleyBasedEra shelleyToBab + let sbe = inject shelleyToBab in subParser "create-protocol-parameters-update" $ Opt.info ( Cmd.GovernanceActionProtocolParametersUpdateCmdArgs - (shelleyToBabbageEraToShelleyBasedEra shelleyToBab) + (inject shelleyToBab) <$> fmap Just (pUpdateProtocolParametersPreConway shelleyToBab) <*> pure Nothing <*> dpGovActionProtocolParametersUpdate sbe @@ -199,11 +199,11 @@ pUpdateProtocolParametersCmd = $ Opt.progDesc "Create a protocol parameters update." ) ( \conwayOnwards -> - let sbe = conwayEraOnwardsToShelleyBasedEra conwayOnwards + let sbe = inject conwayOnwards in subParser "create-protocol-parameters-update" $ Opt.info ( Cmd.GovernanceActionProtocolParametersUpdateCmdArgs - (conwayEraOnwardsToShelleyBasedEra conwayOnwards) + (inject conwayOnwards) Nothing <$> fmap Just (pUpdateProtocolParametersPostConway conwayOnwards) <*> dpGovActionProtocolParametersUpdate sbe diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs index 03fd68e489..031db5e0e3 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Query.hs @@ -678,7 +678,7 @@ pQueryTreasuryValueCmd era envCli = do <*> optional pOutputFile pQueryNoArgCmdArgs - :: () + :: forall era. () => ConwayEraOnwards era -> EnvCli -> Parser (QueryNoArgCmdArgs era) @@ -687,5 +687,5 @@ pQueryNoArgCmdArgs w envCli = <$> pSocketPath envCli <*> pConsensusModeParams <*> pNetworkId envCli - <*> pTarget (conwayEraOnwardsToShelleyBasedEra w) + <*> pTarget (inject w :: ShelleyBasedEra era) <*> optional pOutputFile diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs index 33722c2f6f..e8f6f1aceb 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/StakeAddress.hs @@ -121,7 +121,7 @@ pStakeAddressDeregistrationCertificateCmd = ( \shelleyToBabbage -> subParser "deregistration-certificate" $ Opt.info - ( StakeAddressDeregistrationCertificateCmd (shelleyToBabbageEraToShelleyBasedEra shelleyToBabbage) + ( StakeAddressDeregistrationCertificateCmd (inject shelleyToBabbage) <$> pStakeIdentifier Nothing <*> pure Nothing <*> pOutputFile @@ -131,7 +131,7 @@ pStakeAddressDeregistrationCertificateCmd = ( \conwayOnwards -> subParser "deregistration-certificate" $ Opt.info - ( StakeAddressDeregistrationCertificateCmd (conwayEraOnwardsToShelleyBasedEra conwayOnwards) + ( StakeAddressDeregistrationCertificateCmd (inject conwayOnwards) <$> pStakeIdentifier Nothing <*> fmap Just pKeyRegistDeposit <*> pOutputFile diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs index 2bdb9375e5..cf07a9f14f 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Options/Transaction.hs @@ -227,7 +227,7 @@ pTransactionBuildEstimateCmd eon' _envCli = do where pCmd :: Exp.Era era -> Parser (TransactionCmds era) pCmd era' = do - let sbe = Exp.eraToSbe era' + let sbe = inject era' fmap TransactionBuildEstimateCmd $ TransactionBuildEstimateCmdArgs era' <$> optional pScriptValidity diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs index c982858983..76f93cdf92 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance.hs @@ -65,7 +65,7 @@ runGovernanceCmds = \case runGovernanceVoteCmds cmds runGovernanceMIRCertificatePayStakeAddrs - :: ShelleyToBabbageEra era + :: forall era. ShelleyToBabbageEra era -> L.MIRPot -> [StakeAddress] -- ^ Stake addresses @@ -92,10 +92,11 @@ runGovernanceMIRCertificatePayStakeAddrs w mirPot sAddrs rwdAmts oFp = do makeMIRCertificate $ MirCertificateRequirements w mirPot $ shelleyToBabbageEraConstraints w mirTarget + sbe :: ShelleyBasedEra era = inject w firstExceptT GovernanceCmdTextEnvWriteError . newExceptT - $ shelleyBasedEraConstraints (shelleyToBabbageEraToShelleyBasedEra w) + $ shelleyBasedEraConstraints sbe $ writeLazyByteStringFile oFp $ textEnvelopeToJSON (Just mirCertDesc) mirCert where @@ -103,7 +104,7 @@ runGovernanceMIRCertificatePayStakeAddrs w mirPot sAddrs rwdAmts oFp = do mirCertDesc = "Move Instantaneous Rewards Certificate" runGovernanceCreateMirCertificateTransferToTreasuryCmd - :: () + :: forall era. () => ShelleyToBabbageEra era -> Lovelace -> File () Out @@ -112,10 +113,11 @@ runGovernanceCreateMirCertificateTransferToTreasuryCmd w ll oFp = do let mirTarget = L.SendToOppositePotMIR ll let mirCert = makeMIRCertificate $ MirCertificateRequirements w L.ReservesMIR mirTarget + sbe :: ShelleyBasedEra era = inject w firstExceptT GovernanceCmdTextEnvWriteError . newExceptT - $ shelleyBasedEraConstraints (shelleyToBabbageEraToShelleyBasedEra w) + $ shelleyBasedEraConstraints sbe $ writeLazyByteStringFile oFp $ textEnvelopeToJSON (Just mirCertDesc) mirCert where @@ -123,7 +125,7 @@ runGovernanceCreateMirCertificateTransferToTreasuryCmd w ll oFp = do mirCertDesc = "MIR Certificate Send To Treasury" runGovernanceCreateMirCertificateTransferToReservesCmd - :: () + :: forall era. () => ShelleyToBabbageEra era -> Lovelace -> File () Out @@ -132,10 +134,11 @@ runGovernanceCreateMirCertificateTransferToReservesCmd w ll oFp = do let mirTarget = L.SendToOppositePotMIR ll let mirCert = makeMIRCertificate $ MirCertificateRequirements w L.TreasuryMIR mirTarget + sbe :: ShelleyBasedEra era = inject w firstExceptT GovernanceCmdTextEnvWriteError . newExceptT - $ shelleyBasedEraConstraints (shelleyToBabbageEraToShelleyBasedEra w) + $ shelleyBasedEraConstraints sbe $ writeLazyByteStringFile oFp $ textEnvelopeToJSON (Just mirCertDesc) mirCert where 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 7faa12f9a2..e164dcd8ce 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Actions.hs @@ -3,6 +3,7 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeFamilies #-} module Cardano.CLI.EraBased.Run.Governance.Actions @@ -77,7 +78,7 @@ runGovernanceActionViewCmd proposal runGovernanceActionInfoCmd - :: () + :: forall era. () => GovernanceActionInfoCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionInfoCmd @@ -103,7 +104,7 @@ runGovernanceActionInfoCmd carryHashChecks checkProposalHash proposalAnchor ProposalCheck - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon govAction = InfoAct proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAction proposalAnchor @@ -117,7 +118,7 @@ fetchURLErrorToGovernanceActionError adt = withExceptT (GovernanceActionsProposa -- TODO: Conway era - update with new ledger types from cardano-ledger-conway-1.7.0.0 runGovernanceActionCreateNoConfidenceCmd - :: () + :: forall era. () => GovernanceActionCreateNoConfidenceCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionCreateNoConfidenceCmd @@ -144,7 +145,7 @@ runGovernanceActionCreateNoConfidenceCmd carryHashChecks checkProposalHash proposalAnchor ProposalCheck - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon previousGovernanceAction = MotionOfNoConfidence $ L.maybeToStrictMaybe $ @@ -165,7 +166,7 @@ runGovernanceActionCreateNoConfidenceCmd writeFileTextEnvelope outFile (Just "Motion of no confidence proposal") proposalProcedure runGovernanceActionCreateConstitutionCmd - :: () + :: forall era. () => GovernanceActionCreateConstitutionCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionCreateConstitutionCmd @@ -210,7 +211,7 @@ runGovernanceActionCreateConstitutionCmd prevGovActId constitutionAnchor (toShelleyScriptHash <$> L.maybeToStrictMaybe constitutionScript) - sbe = conwayEraOnwardsToShelleyBasedEra eon + sbe :: ShelleyBasedEra era = inject eon proposalProcedure = createProposalProcedure sbe networkId deposit depositStakeCredential govAct proposalAnchor carryHashChecks checkConstitutionHash constitutionAnchor ConstitutionCheck @@ -225,7 +226,7 @@ runGovernanceActionCreateConstitutionCmd -- TODO: Conway era - After ledger bump update this function -- with the new ledger types runGovernanceActionUpdateCommitteeCmd - :: () + :: forall era. () => GovernanceActionUpdateCommitteeCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionUpdateCommitteeCmd @@ -243,7 +244,7 @@ runGovernanceActionUpdateCommitteeCmd , Cmd.mPrevGovernanceActionId , Cmd.outFile } = do - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon govActIdentifier = L.maybeToStrictMaybe $ shelleyBasedEraConstraints sbe $ @@ -301,7 +302,7 @@ runGovernanceActionUpdateCommitteeCmd proposal runGovernanceActionCreateProtocolParametersUpdateCmd - :: () + :: forall era. () => Cmd.GovernanceActionProtocolParametersUpdateCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do @@ -309,7 +310,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do caseShelleyToBabbageOrConwayEraOnwards ( \sToB -> do let oFp = uppFilePath eraBasedPParams' - anyEra = AnyShelleyBasedEra $ shelleyToBabbageEraToShelleyBasedEra sToB + anyEra = AnyShelleyBasedEra (inject sToB :: ShelleyBasedEra era) UpdateProtocolParametersPreConway _stB expEpoch genesisVerKeys <- hoistMaybe (GovernanceActionsValueUpdateProtocolParametersNotFound anyEra) $ uppPreConway eraBasedPParams' @@ -335,7 +336,7 @@ runGovernanceActionCreateProtocolParametersUpdateCmd eraBasedPParams' = do ) ( \conwayOnwards -> do let oFp = uppFilePath eraBasedPParams' - anyEra = AnyShelleyBasedEra $ conwayEraOnwardsToShelleyBasedEra conwayOnwards + anyEra = AnyShelleyBasedEra (inject conwayOnwards :: ShelleyBasedEra era) UpdateProtocolParametersConwayOnwards _cOnwards @@ -413,7 +414,7 @@ addCostModelsToEraBasedProtocolParametersUpdate ConwayEraBasedProtocolParametersUpdate common (aOn{alCostModels = SJust cmdls}) inB inC runGovernanceActionTreasuryWithdrawalCmd - :: () + :: forall era. () => GovernanceActionTreasuryWithdrawalCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionTreasuryWithdrawalCmd @@ -446,7 +447,7 @@ runGovernanceActionTreasuryWithdrawalCmd firstExceptT GovernanceActionsReadStakeCredErrror $ getStakeCredentialFromIdentifier stakeIdentifier pure (networkId, stakeCredential, lovelace) - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon treasuryWithdrawals = TreasuryWithdrawal withdrawals @@ -465,7 +466,7 @@ runGovernanceActionTreasuryWithdrawalCmd writeFileTextEnvelope outFile (Just "Treasury withdrawal proposal") proposal runGovernanceActionHardforkInitCmd - :: () + :: forall era. () => GovernanceActionHardforkInitCmdArgs era -> ExceptT GovernanceActionsError IO () runGovernanceActionHardforkInitCmd @@ -493,7 +494,7 @@ runGovernanceActionHardforkInitCmd carryHashChecks checkProposalHash proposalAnchor ProposalCheck - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon govActIdentifier = L.maybeToStrictMaybe $ shelleyBasedEraConstraints sbe $ diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs index f8759e4acc..740f5d97b4 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/GenesisKeyDelegationCertificate.hs @@ -1,5 +1,7 @@ {-# LANGUAGE DataKinds #-} {-# LANGUAGE GADTs #-} +{-# LANGUAGE RankNTypes #-} +{-# LANGUAGE ScopedTypeVariables #-} module Cardano.CLI.EraBased.Run.Governance.GenesisKeyDelegationCertificate ( runGovernanceGenesisKeyDelegationCertificate @@ -13,7 +15,7 @@ import Cardano.CLI.Types.Errors.GovernanceCmdError import Cardano.CLI.Types.Key runGovernanceGenesisKeyDelegationCertificate - :: ShelleyToBabbageEra era + :: forall era. ShelleyToBabbageEra era -> VerificationKeyOrHashOrFile GenesisKey -> VerificationKeyOrHashOrFile GenesisDelegateKey -> VerificationKeyOrHashOrFile VrfKey @@ -41,7 +43,7 @@ runGovernanceGenesisKeyDelegationCertificate firstExceptT GovernanceCmdTextEnvWriteError . newExceptT $ writeLazyByteStringFile oFp - $ shelleyBasedEraConstraints (shelleyToBabbageEraToShelleyBasedEra stb) + $ shelleyBasedEraConstraints (inject stb :: ShelleyBasedEra era) $ textEnvelopeToJSON (Just genKeyDelegCertDesc) genKeyDelegCert where genKeyDelegCertDesc :: TextEnvelopeDescr diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs index b48c073660..582332f911 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Governance/Vote.hs @@ -41,7 +41,7 @@ runGovernanceVoteCmds = \case & firstExceptT CmdGovernanceVoteError runGovernanceVoteCreateCmd - :: () + :: forall era. () => Cmd.GovernanceVoteCreateCmdArgs era -> ExceptT GovernanceVoteCmdError IO () runGovernanceVoteCreateCmd @@ -54,7 +54,7 @@ runGovernanceVoteCreateCmd , outFile } = do let (govActionTxId, govActionIndex) = governanceAction - sbe = conwayEraOnwardsToShelleyBasedEra eon -- TODO: Conway era - update vote creation related function to take ConwayEraOnwards + sbe :: ShelleyBasedEra era = inject eon -- TODO: Conway era - update vote creation related function to take ConwayEraOnwards mAnchor' = fmap ( \pca@PotentiallyCheckedAnchor{pcaAnchor = (VoteUrl url, voteHash)} -> @@ -92,7 +92,7 @@ runGovernanceVoteCreateCmd writeFileTextEnvelope outFile Nothing votingProcedures runGovernanceVoteViewCmd - :: () + :: forall era. () => Cmd.GovernanceVoteViewCmdArgs era -> ExceptT GovernanceVoteCmdError IO () runGovernanceVoteViewCmd @@ -102,7 +102,7 @@ runGovernanceVoteViewCmd , voteFile , mOutFile } = do - let sbe = conwayEraOnwardsToShelleyBasedEra eon + let sbe :: ShelleyBasedEra era = inject eon shelleyBasedEraConstraints sbe $ do voteProcedures <- diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs index 08a8678e27..7578e00dba 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Run/Transaction.hs @@ -136,7 +136,7 @@ runTransactionBuildCmd , treasuryDonation -- Maybe TxTreasuryDonation , buildOutputOptions } = do - let eon = Exp.eraToSbe currentEra + let eon = inject currentEra era' = toCardanoEra eon -- The user can specify an era prior to the era that the node is currently in. @@ -350,8 +350,8 @@ runTransactionBuildEstimateCmd -- TODO change type , currentTreasuryValueAndDonation , txBodyOutFile } = do - let sbe = Exp.eraToSbe currentEra - meo = babbageEraOnwardsToMaryEraOnwards $ Exp.eraToBabbageEraOnwards currentEra + let sbe = inject currentEra + meo = babbageEraOnwardsToMaryEraOnwards $ inject currentEra ledgerPParams <- firstExceptT TxCmdProtocolParamsError $ readProtocolParameters sbe protocolParamsFile diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs index 8c95c4bf3f..6791c4b64d 100644 --- a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs +++ b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs @@ -786,10 +786,10 @@ friendlyFee = \case friendlyLovelace :: Lovelace -> Aeson.Value friendlyLovelace value = String $ docToText (pretty value) -friendlyMintValue :: TxMintValue ViewTx era -> Aeson.Value +friendlyMintValue :: forall era. TxMintValue ViewTx era -> Aeson.Value friendlyMintValue = \case TxMintNone -> Null - TxMintValue sbe v _ -> friendlyValue (maryEraOnwardsToShelleyBasedEra sbe) v + TxMintValue sbe v _ -> friendlyValue ((inject sbe) :: ShelleyBasedEra era) v friendlyTxOutValue :: TxOutValue era -> Aeson.Value friendlyTxOutValue = \case diff --git a/cardano-cli/src/Cardano/CLI/Read.hs b/cardano-cli/src/Cardano/CLI/Read.hs index 204e9672bc..d1339d00a2 100644 --- a/cardano-cli/src/Cardano/CLI/Read.hs +++ b/cardano-cli/src/Cardano/CLI/Read.hs @@ -919,7 +919,7 @@ readSingleVote w (voteFp, mScriptWitFiles) = do case mScriptWitFiles of Nothing -> pure $ (,Nothing) <$> votProceds sWitFile -> do - let sbe = conwayEraOnwardsToShelleyBasedEra w + let sbe = inject w runExceptT $ do sWits <- firstExceptT VoteErrorScriptWitness $ @@ -965,7 +965,7 @@ readProposal w (fp, mScriptWit) = do case mScriptWit of Nothing -> pure $ (,Nothing) <$> prop sWitFile -> do - let sbe = conwayEraOnwardsToShelleyBasedEra w + let sbe = inject w runExceptT $ do sWit <- firstExceptT ProposalErrorScriptWitness $ From 9c3bac23aca8ea7dbfcc1455db418935a8a7be01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Hurlin?= Date: Thu, 14 Nov 2024 17:26:06 +0100 Subject: [PATCH 2/2] Add SRP !! DO NOT MERGE !! --- cabal.project | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cabal.project b/cabal.project index 1864d105fa..14adcfefd6 100644 --- a/cabal.project +++ b/cabal.project @@ -57,3 +57,9 @@ write-ghc-environment-files: always -- IMPORTANT -- Do NOT add more source-repository-package stanzas here unless they are strictly -- temporary! Please read the section in CONTRIBUTING about updating dependencies. + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api + subdir: cardano-api + tag: aa2a852403e6ac7fdb0db28ff79b21ba8efcafe2