Added missing translations

Author: Soupstraw

eras/conway/impl/CHANGELOG.md

@@ -2,9 +2,10 @@
 
 ## 1.20.0.0
 
+* Remove era parametrization from `GovPurposeId`, `GovRelation`
 * Move to `testlib` the `DecCBOR` instance for `TxBody ConwayEra`
 * Add `ReferenceInputsNotDisjointFromInputs`
-- Remove `ConwayNewEpochPredFailure` and replace it with `Void`. #5007
+* Remove `ConwayNewEpochPredFailure` and replace it with `Void`. #5007
 * Added to `PParams`: `ppCommitteeMaxTermLength`,`ppCommitteeMinSize`,`ppDRepActivity`,`ppDRepDeposit`,`ppDRepVotingThresholds`,`ppGovActionDeposit`,`ppGovActionLifetime`,`ppGovProtocolVersion`,`ppMinFeeRefScriptCostPerByte`,`ppPoolVotingThresholds`
 * Moved `ConwayEraPlutusTxInfo` class from `Context` module to `TxInfo`
 * Removed `Cardano.Ledger.Conway.Plutus.Context` module

eras/conway/impl/src/Cardano/Ledger/Conway/Governance.hs

@@ -164,6 +164,7 @@ module Cardano.Ledger.Conway.Governance (
   reCommitteeStateL,
   DefaultVote (..),
   defaultStakePoolVote,
+  translateProposals,
 
   -- * Exported for testing
   pparamsUpdateThreshold,

eras/conway/impl/src/Cardano/Ledger/Conway/TxBody.hs

@@ -47,6 +47,8 @@ module Cardano.Ledger.Conway.TxBody (
   ConwayTxBodyRaw (..),
   conwayTotalDepositsTxBody,
   conwayProposalsDeposits,
+  conwayRedeemerPointer,
+  conwayRedeemerPointerInverse,
 ) where
 
 import Cardano.Ledger.Alonzo.TxBody (Indexable (..))

eras/conway/impl/test/Main.hs

@@ -32,7 +32,7 @@ main =
       Spec.spec
       Proposals.spec
       Binary.spec
-      Cddl.spec
+      Cddl.spec @ConwayEra
       DRepRatify.spec
       CommitteeRatify.spec
       SPORatifySpec.spec

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Binary/CddlSpec.hs

@@ -8,6 +8,7 @@
 module Test.Cardano.Ledger.Conway.Binary.CddlSpec (spec) where
 
 import Cardano.Ledger.Allegra.Scripts
+import Cardano.Ledger.Alonzo (AlonzoScript, AlonzoTxAuxData)
 import Cardano.Ledger.Alonzo.Scripts (CostModels)
 import Cardano.Ledger.Alonzo.TxWits (Redeemers)
 import Cardano.Ledger.Binary (DecCBOR)
@@ -27,17 +28,20 @@ import Test.Cardano.Ledger.Binary.Cuddle (
   specWithHuddle,
  )
 import Test.Cardano.Ledger.Common
-import Test.Cardano.Ledger.Conway.Binary.Annotator (Annotator)
 import Test.Cardano.Ledger.Conway.Binary.Cddl (readConwayCddlFiles)
 import Test.Cardano.Ledger.Conway.CDDL (conwayCDDL)
 import Test.Cardano.Ledger.Conway.ImpTest (ConwayEraImp)
 
 spec ::
   forall era.
   ( ConwayEraImp era
-  , DecCBOR (Annotator (TxBody era))
-  , DecCBOR (Annotator (TxWits era))
-  , DecCBOR (Annotator (Tx era))
+  , DecCBOR (TxBody era)
+  , DecCBOR (AlonzoTxAuxData era)
+  , DecCBOR (Timelock era)
+  , DecCBOR (AlonzoScript era)
+  , DecCBOR (TxWits era)
+  , DecCBOR (Redeemers era)
+  , DecCBOR (Tx era)
   ) =>
   Spec
 spec = do

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Binary/RoundTrip.hs

@@ -77,14 +77,14 @@ roundTripConwayEraTypesSpec ::
   ) =>
   Spec
 roundTripConwayEraTypesSpec = do
-  describe "Conway Transaction Types" $ do
+  describe (eraName @era <> " Transaction Types") $ do
     roundTripEraTypeSpec @era @GovAction
     roundTripEraTypeSpec @era @VotingProcedure
     roundTripEraTypeSpec @era @VotingProcedures
     roundTripEraTypeSpec @era @ProposalProcedure
     roundTripEraTypeSpec @era @Constitution
     prop "CostModels" $ roundTripEraExpectation @era @CostModels
-  describe "Conway State Types" $ do
+  describe (eraName @era <> " State Types") $ do
     roundTripShareEraTypeSpec @era @EnactState
     roundTripShareEraTypeSpec @era @GovActionState
     roundTripShareEraTypeSpec @era @Proposals

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Imp/UtxosSpec.hs

@@ -110,7 +110,7 @@ datumAndReferenceInputsSpec = do
               , mkTxInPartial producingTx 1
               ]
     (referringTx ^. witsTxL . scriptTxWitsL) `shouldBe` mempty
-  it "fails with same txIn in regular inputs and reference inputs" $ do
+  it "fails with same txIn in regular inputs and reference inputs (PlutusV1)" $ do
     producingTx <- setupRefTx SPlutusV1
     let
       consumingTx =
@@ -156,7 +156,7 @@ datumAndReferenceInputsSpec = do
             CollectErrors
               [BadTranslation . inject . InlineDatumsNotSupported @era $ TxOutFromInput lockedTxIn]
         )
-  it "fails with same txIn in regular inputs and reference inputs" $ do
+  it "fails with same txIn in regular inputs and reference inputs (PlutusV3)" $ do
     producingTx <- setupRefTx SPlutusV3
     let
       consumingTx =

eras/dijkstra/cardano-ledger-dijkstra.cabal

@@ -50,18 +50,9 @@ library
     Cardano.Ledger.Dijkstra.Rules.Cert
     Cardano.Ledger.Dijkstra.Rules.Certs
     Cardano.Ledger.Dijkstra.Rules.Deleg
-    Cardano.Ledger.Dijkstra.Rules.Enact
-    Cardano.Ledger.Dijkstra.Rules.Epoch
     Cardano.Ledger.Dijkstra.Rules.Gov
-    Cardano.Ledger.Dijkstra.Rules.GovCert
-    Cardano.Ledger.Dijkstra.Rules.HardFork
     Cardano.Ledger.Dijkstra.Rules.Ledger
     Cardano.Ledger.Dijkstra.Rules.Ledgers
-    Cardano.Ledger.Dijkstra.Rules.Mempool
-    Cardano.Ledger.Dijkstra.Rules.NewEpoch
-    Cardano.Ledger.Dijkstra.Rules.Pool
-    Cardano.Ledger.Dijkstra.Rules.Ratify
-    Cardano.Ledger.Dijkstra.Rules.Tickf
     Cardano.Ledger.Dijkstra.Rules.Utxo
     Cardano.Ledger.Dijkstra.Rules.Utxos
     Cardano.Ledger.Dijkstra.Rules.Utxow

eras/dijkstra/src/Cardano/Ledger/Dijkstra/Rules.hs

@@ -12,18 +12,9 @@ import Cardano.Ledger.Dijkstra.Rules.Bbody ()
 import Cardano.Ledger.Dijkstra.Rules.Cert ()
 import Cardano.Ledger.Dijkstra.Rules.Certs ()
 import Cardano.Ledger.Dijkstra.Rules.Deleg ()
-import Cardano.Ledger.Dijkstra.Rules.Enact ()
-import Cardano.Ledger.Dijkstra.Rules.Epoch ()
 import Cardano.Ledger.Dijkstra.Rules.Gov ()
-import Cardano.Ledger.Dijkstra.Rules.GovCert ()
-import Cardano.Ledger.Dijkstra.Rules.HardFork ()
 import Cardano.Ledger.Dijkstra.Rules.Ledger ()
 import Cardano.Ledger.Dijkstra.Rules.Ledgers ()
-import Cardano.Ledger.Dijkstra.Rules.Mempool ()
-import Cardano.Ledger.Dijkstra.Rules.NewEpoch ()
-import Cardano.Ledger.Dijkstra.Rules.Pool ()
-import Cardano.Ledger.Dijkstra.Rules.Ratify ()
-import Cardano.Ledger.Dijkstra.Rules.Tickf ()
 import Cardano.Ledger.Dijkstra.Rules.Utxo ()
 import Cardano.Ledger.Dijkstra.Rules.Utxos ()
 import Cardano.Ledger.Dijkstra.Rules.Utxow ()