Switch to using TxCert type family

Instead of using the `ConwayTxCert` concrete type. This will be helpful
when we start defining a new era.

Author: lehins

eras/conway/impl/CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## 1.19.0.0
 
+* Switch `ctbrCerts` to use `TxCert` instead of `ConwayTxCert`
 * Add `DecCBOR` instance for `ConwayTxBody`
 * Converted `CertState` to a type family
 * Remove `ConwayMempoolPredFailure` and `ConwayMempoolEvent`

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Cert.hs

@@ -4,7 +4,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE LambdaCase #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
-{-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RankNTypes #-}
 {-# LANGUAGE RecordWildCards #-}

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

@@ -15,7 +15,6 @@
 {-# LANGUAGE StandaloneDeriving #-}
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
-{-# LANGUAGE TypeOperators #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 {-# LANGUAGE ViewPatterns #-}
@@ -98,7 +97,6 @@ import Cardano.Ledger.Conway.PParams (ConwayEraPParams, ppGovActionDepositL)
 import Cardano.Ledger.Conway.Scripts (ConwayEraScript, ConwayPlutusPurpose (..))
 import Cardano.Ledger.Conway.TxCert (
   ConwayEraTxCert,
-  ConwayTxCert (..),
   ConwayTxCertUpgradeError,
  )
 import Cardano.Ledger.Conway.TxOut ()
@@ -138,7 +136,7 @@ data ConwayTxBodyRaw era = ConwayTxBodyRaw
   , ctbrOutputs :: !(StrictSeq (Sized (TxOut era)))
   , ctbrCollateralReturn :: !(StrictMaybe (Sized (TxOut era)))
   , ctbrTotalCollateral :: !(StrictMaybe Coin)
-  , ctbrCerts :: !(OSet.OSet (ConwayTxCert era))
+  , ctbrCerts :: !(OSet.OSet (TxCert era))
   , ctbrWithdrawals :: !Withdrawals
   , ctbrTxfee :: !Coin
   , ctbrVldt :: !ValidityInterval
@@ -154,25 +152,24 @@ data ConwayTxBodyRaw era = ConwayTxBodyRaw
   }
   deriving (Generic, Typeable)
 
-deriving instance (EraPParams era, Eq (TxOut era)) => Eq (ConwayTxBodyRaw era)
+deriving instance (EraPParams era, Eq (TxCert era), Eq (TxOut era)) => Eq (ConwayTxBodyRaw era)
 
 instance
-  (EraPParams era, NoThunks (TxOut era)) =>
+  (EraPParams era, NoThunks (TxCert era), NoThunks (TxOut era)) =>
   NoThunks (ConwayTxBodyRaw era)
 
 instance
-  (EraPParams era, NFData (TxOut era)) =>
+  (EraPParams era, NFData (TxCert era), NFData (TxOut era)) =>
   NFData (ConwayTxBodyRaw era)
 
 deriving instance
-  (EraPParams era, Show (TxOut era)) =>
+  (EraPParams era, Show (TxCert era), Show (TxOut era)) =>
   Show (ConwayTxBodyRaw era)
 
 instance
   ( EraPParams era
+  , EraTxCert era
   , DecCBOR (TxOut era)
-  , ShelleyEraTxCert era
-  , TxCert era ~ ConwayTxCert era
   ) =>
   DecCBOR (ConwayTxBodyRaw era)
   where
@@ -269,26 +266,25 @@ newtype ConwayTxBody era = TxBodyConstr (MemoBytes (ConwayTxBodyRaw era))
 
 deriving newtype instance
   ( EraPParams era
+  , EraTxCert era
   , DecCBOR (TxOut era)
-  , ShelleyEraTxCert era
-  , TxCert era ~ ConwayTxCert era
   ) =>
   DecCBOR (ConwayTxBody era)
 
 deriving instance
-  (EraPParams era, NoThunks (TxOut era)) =>
+  (EraPParams era, NoThunks (TxOut era), NoThunks (TxCert era)) =>
   NoThunks (ConwayTxBody era)
 
 deriving instance
-  (EraPParams era, Eq (TxOut era)) =>
+  (EraPParams era, Eq (TxOut era), Eq (TxCert era)) =>
   Eq (ConwayTxBody era)
 
 deriving newtype instance
-  (EraPParams era, NFData (TxOut era)) =>
+  (EraPParams era, NFData (TxOut era), NFData (TxCert era)) =>
   NFData (ConwayTxBody era)
 
 deriving instance
-  (EraPParams era, Show (TxOut era)) =>
+  (EraPParams era, Show (TxOut era), Show (TxCert era)) =>
   Show (ConwayTxBody era)
 
 type instance MemoHashIndex (ConwayTxBodyRaw era) = EraIndependentTxBody
@@ -298,9 +294,8 @@ instance HashAnnotated (ConwayTxBody era) EraIndependentTxBody where
 
 instance
   ( DecCBOR (TxOut era)
+  , EraTxCert era
   , EraPParams era
-  , ShelleyEraTxCert era
-  , TxCert era ~ ConwayTxCert era
   ) =>
   DecCBOR (Annotator (ConwayTxBodyRaw era))
   where
@@ -310,9 +305,8 @@ deriving via
   Mem (ConwayTxBodyRaw era)
   instance
     ( DecCBOR (TxOut era)
+    , EraTxCert era
     , EraPParams era
-    , ShelleyEraTxCert era
-    , TxCert era ~ ConwayTxCert era
     ) =>
     DecCBOR (Annotator (ConwayTxBody era))
 
@@ -561,7 +555,7 @@ pattern ConwayTxBody ::
   StrictSeq (Sized (TxOut era)) ->
   StrictMaybe (Sized (TxOut era)) ->
   StrictMaybe Coin ->
-  OSet.OSet (ConwayTxCert era) ->
+  OSet.OSet (TxCert era) ->
   Withdrawals ->
   Coin ->
   ValidityInterval ->

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/Arbitrary.hs

@@ -544,6 +544,7 @@ instance
   , Arbitrary (Value era)
   , Arbitrary (Script era)
   , Arbitrary (PParamsUpdate era)
+  , Arbitrary (TxCert era)
   ) =>
   Arbitrary (ConwayTxBody era)
   where

eras/conway/impl/testlib/Test/Cardano/Ledger/Conway/TreeDiff.hs

@@ -165,11 +165,11 @@ instance
 
 -- TxBody
 instance
-  (EraPParams era, ToExpr (PParamsHKD StrictMaybe era), ToExpr (TxOut era)) =>
+  (EraPParams era, ToExpr (PParamsHKD StrictMaybe era), ToExpr (TxOut era), ToExpr (TxCert era)) =>
   ToExpr (ConwayTxBodyRaw era)
 
 instance
-  (EraPParams era, ToExpr (PParamsHKD StrictMaybe era), ToExpr (TxOut era)) =>
+  (EraPParams era, ToExpr (PParamsHKD StrictMaybe era), ToExpr (TxOut era), ToExpr (TxCert era)) =>
   ToExpr (ConwayTxBody era)
 
 -- Rules/Cert

libs/cardano-ledger-test/src/Test/Cardano/Ledger/Generic/Same.hs

@@ -530,7 +530,7 @@ sameConwayTxBody
     , ("Outputs", eqVia (ppList (pcTxOut proof . sizedValue) . toList) o1 o2)
     , ("ColReturn", eqVia (ppStrictMaybe (pcTxOut proof . sizedValue)) cr1 cr2)
     , ("TotalCol", eqVia (ppStrictMaybe pcCoin) tc1 tc2)
-    , ("Certs", eqVia (ppList pcConwayTxCert . toList) c1 c2)
+    , ("Certs", eqVia (ppList (pcTxCert proof) . toList) c1 c2)
     , ("WDRL", eqVia (ppMap pcRewardAccount pcCoin) w1 w2)
     , ("Fee", eqVia pcCoin f1 f2)
     , ("ValidityInterval", eqVia ppValidityInterval v1 v2)