Removed era parameters from raw TxBodies

Author: Soupstraw

eras/allegra/impl/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.8.0.0
 
+* Remove `AllegraTxBody`
+* Removed `era` parameter from `AllegraTxBodyRaw`
 * Move `Annotator` instances to `testlib`
 * Expose access to `AllegraTxBodyRaw`, `AllegraTxAuxData` and `TimelockRaw`
 * Expose constructor `MkAllegraTxBody`, `MkTxAuxData` and `MkTimelock`

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/TxBody.hs

@@ -171,7 +171,7 @@ class (MaryEraTxBody era, AlonzoEraTxOut era) => AlonzoEraTxBody era where
 
 -- ======================================
 
-data AlonzoTxBodyRaw era = AlonzoTxBodyRaw
+data AlonzoTxBodyRaw = AlonzoTxBodyRaw
   { atbrInputs :: !(Set TxIn)
   , atbrCollateral :: !(Set TxIn)
   , atbrOutputs :: !(StrictSeq (TxOut AlonzoEra))
@@ -188,24 +188,16 @@ data AlonzoTxBodyRaw era = AlonzoTxBodyRaw
   }
   deriving (Generic)
 
-deriving instance
-  (Era era, Eq (TxOut era), Eq (TxCert era), Eq (PParamsUpdate era)) =>
-  Eq (AlonzoTxBodyRaw era)
+deriving instance Eq AlonzoTxBodyRaw
 
-instance
-  (Era era, NoThunks (TxOut era), NoThunks (TxCert era), NoThunks (PParamsUpdate era)) =>
-  NoThunks (AlonzoTxBodyRaw era)
+instance NoThunks AlonzoTxBodyRaw
 
-instance
-  (Era era, NFData (TxOut era), NFData (TxCert era), NFData (PParamsUpdate era)) =>
-  NFData (AlonzoTxBodyRaw era)
+instance NFData AlonzoTxBodyRaw
 
-deriving instance
-  (Era era, Show (TxOut era), Show (TxCert era), Show (PParamsUpdate era)) =>
-  Show (AlonzoTxBodyRaw era)
+deriving instance Show AlonzoTxBodyRaw
 
 instance Memoized (TxBody AlonzoEra) where
-  type RawType (TxBody AlonzoEra) = AlonzoTxBodyRaw AlonzoEra
+  type RawType (TxBody AlonzoEra) = AlonzoTxBodyRaw
 
 data AlonzoTxBodyUpgradeError
   = -- | The TxBody contains a protocol parameter update that attempts to update
@@ -215,7 +207,7 @@ data AlonzoTxBodyUpgradeError
   deriving (Show)
 
 instance EraTxBody AlonzoEra where
-  newtype TxBody AlonzoEra = MkAlonzoTxBody (MemoBytes (AlonzoTxBodyRaw AlonzoEra))
+  newtype TxBody AlonzoEra = MkAlonzoTxBody (MemoBytes AlonzoTxBodyRaw)
     deriving (ToCBOR, Generic)
     deriving newtype (SafeToHash)
   type TxBodyUpgradeError AlonzoEra = AlonzoTxBodyUpgradeError
@@ -454,7 +446,7 @@ pattern AlonzoTxBody
 
 {-# COMPLETE AlonzoTxBody #-}
 
-type instance MemoHashIndex (AlonzoTxBodyRaw era) = EraIndependentTxBody
+type instance MemoHashIndex AlonzoTxBodyRaw = EraIndependentTxBody
 
 instance HashAnnotated (TxBody AlonzoEra) EraIndependentTxBody where
   hashAnnotated = getMemoSafeHash
@@ -526,10 +518,7 @@ instance EqRaw (TxBody AlonzoEra)
 -- | Encodes memoized bytes created upon construction.
 instance EncCBOR (TxBody AlonzoEra)
 
-instance
-  (Era era, EncCBOR (TxOut era), EncCBOR (TxCert era), EncCBOR (PParamsUpdate era)) =>
-  EncCBOR (AlonzoTxBodyRaw era)
-  where
+instance EncCBOR AlonzoTxBodyRaw where
   encCBOR
     AlonzoTxBodyRaw
       { atbrInputs
@@ -566,10 +555,7 @@ instance
           !> encodeKeyedStrictMaybe 7 atbrAuxDataHash
           !> encodeKeyedStrictMaybe 15 atbrTxNetworkId
 
-instance
-  (Era era, DecCBOR (TxOut era), DecCBOR (TxCert era), DecCBOR (PParamsUpdate era)) =>
-  DecCBOR (AlonzoTxBodyRaw era)
-  where
+instance DecCBOR AlonzoTxBodyRaw where
   decCBOR =
     decode $
       SparseKeyed
@@ -578,7 +564,7 @@ instance
         bodyFields
         requiredFields
     where
-      bodyFields :: Word -> Field (AlonzoTxBodyRaw era)
+      bodyFields :: Word -> Field AlonzoTxBodyRaw
       bodyFields 0 = field (\x tx -> tx {atbrInputs = x}) From
       bodyFields 1 = field (\x tx -> tx {atbrOutputs = x}) From
       bodyFields 2 = field (\x tx -> tx {atbrTxFee = x}) From
@@ -606,7 +592,7 @@ instance
         , (2, "fee")
         ]
 
-emptyAlonzoTxBodyRaw :: AlonzoTxBodyRaw era
+emptyAlonzoTxBodyRaw :: AlonzoTxBodyRaw
 emptyAlonzoTxBodyRaw =
   AlonzoTxBodyRaw
     mempty

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/Binary/Annotator.hs

@@ -238,15 +238,9 @@ deriving via
   instance
     Era era => DecCBOR (Annotator (AlonzoTxAuxData era))
 
-deriving via
-  Mem (AlonzoTxBodyRaw AlonzoEra)
-  instance
-    DecCBOR (Annotator (TxBody AlonzoEra))
+deriving via Mem AlonzoTxBodyRaw instance DecCBOR (Annotator (TxBody AlonzoEra))
 
-instance
-  (Era era, DecCBOR (TxOut era), DecCBOR (TxCert era), DecCBOR (PParamsUpdate era)) =>
-  DecCBOR (Annotator (AlonzoTxBodyRaw era))
-  where
+instance DecCBOR (Annotator AlonzoTxBodyRaw) where
   decCBOR = pure <$> decCBOR
 
 instance

eras/alonzo/impl/testlib/Test/Cardano/Ledger/Alonzo/TreeDiff.hs

@@ -93,9 +93,7 @@ instance ToExpr DataHash32
 instance ToExpr (CompactForm (Value era)) => ToExpr (AlonzoTxOut era)
 
 -- TxBody
-instance
-  (Era era, ToExpr (TxOut era), ToExpr (TxCert era), ToExpr (PParamsUpdate era)) =>
-  ToExpr (AlonzoTxBodyRaw era)
+instance ToExpr AlonzoTxBodyRaw
 
 instance ToExpr (TxBody AlonzoEra)
 

eras/babbage/impl/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.12.0.0
 
+* Remove `BabbageTxBody`
+* Removed `era` parameter from `BabbageTxBodyRaw`
 * Move `Annotator` instances to `testlib`
 * Expose access to `BabbageTxBodyRaw`
 * Expose constructor `MkBabbageTxBody`

eras/babbage/impl/src/Cardano/Ledger/Babbage/TxBody.hs

@@ -144,18 +144,18 @@ class (AlonzoEraTxBody era, BabbageEraTxOut era) => BabbageEraTxBody era where
 
 -- ======================================
 
-data BabbageTxBodyRaw era = BabbageTxBodyRaw
+data BabbageTxBodyRaw = BabbageTxBodyRaw
   { btbrInputs :: !(Set TxIn)
   , btbrCollateralInputs :: !(Set TxIn)
   , btbrReferenceInputs :: !(Set TxIn)
-  , btbrOutputs :: !(StrictSeq (Sized (TxOut era)))
-  , btbrCollateralReturn :: !(StrictMaybe (Sized (TxOut era)))
+  , btbrOutputs :: !(StrictSeq (Sized (TxOut BabbageEra)))
+  , btbrCollateralReturn :: !(StrictMaybe (Sized (TxOut BabbageEra)))
   , btbrTotalCollateral :: !(StrictMaybe Coin)
-  , btbrCerts :: !(StrictSeq (TxCert era))
+  , btbrCerts :: !(StrictSeq (TxCert BabbageEra))
   , btbrWithdrawals :: !Withdrawals
   , btbrFee :: !Coin
   , btbrValidityInterval :: !ValidityInterval
-  , btbrUpdate :: !(StrictMaybe (Update era))
+  , btbrUpdate :: !(StrictMaybe (Update BabbageEra))
   , btbrReqSignerHashes :: !(Set (KeyHash 'Witness))
   , btbrMint :: !MultiAsset
   , -- The spec makes it clear that the mint field is a
@@ -171,10 +171,7 @@ data BabbageTxBodyRaw era = BabbageTxBodyRaw
 -- We override this instance because the 'Sized' types also reference their
 -- serialisation and as such cannot be compared directly. An alternative would
 -- be to derive `EqRaw` for `Sized`.
-instance
-  (Era era, Eq (TxOut era), Eq (TxCert era), Eq (PParamsUpdate era)) =>
-  EqRaw (BabbageTxBodyRaw era)
-  where
+instance EqRaw BabbageTxBodyRaw where
   eqRaw a b =
     btbrInputs a == btbrInputs b
       && btbrCollateralInputs a == btbrCollateralInputs b
@@ -202,28 +199,20 @@ instance
           && F.foldl' (\acc (x', y') -> acc && x' `eqUnsized` y') True (StrictSeq.zip x y)
       eqUnsized x y = sizedValue x == sizedValue y
 
-type instance MemoHashIndex (BabbageTxBodyRaw era) = EraIndependentTxBody
+type instance MemoHashIndex BabbageTxBodyRaw = EraIndependentTxBody
 
-deriving instance
-  (Era era, Eq (TxOut era), Eq (TxCert era), Eq (PParamsUpdate era)) =>
-  Eq (BabbageTxBodyRaw era)
+deriving instance Eq BabbageTxBodyRaw
 
-instance
-  (Era era, NoThunks (TxOut era), NoThunks (TxCert era), NoThunks (PParamsUpdate era)) =>
-  NoThunks (BabbageTxBodyRaw era)
+instance NoThunks BabbageTxBodyRaw
 
-instance
-  (Era era, NFData (TxOut era), NFData (TxCert era), NFData (PParamsUpdate era)) =>
-  NFData (BabbageTxBodyRaw era)
+instance NFData BabbageTxBodyRaw
 
-deriving instance
-  (Era era, Show (TxOut era), Show (TxCert era), Show (PParamsUpdate era)) =>
-  Show (BabbageTxBodyRaw era)
+deriving instance Show BabbageTxBodyRaw
 
 deriving newtype instance DecCBOR (TxBody BabbageEra)
 
 instance Memoized (TxBody BabbageEra) where
-  type RawType (TxBody BabbageEra) = BabbageTxBodyRaw BabbageEra
+  type RawType (TxBody BabbageEra) = BabbageTxBodyRaw
 
 deriving newtype instance NFData (TxBody BabbageEra)
 
@@ -265,7 +254,7 @@ data BabbageTxBodyUpgradeError
   deriving (Eq, Show)
 
 instance EraTxBody BabbageEra where
-  newtype TxBody BabbageEra = MkBabbageTxBody (MemoBytes (BabbageTxBodyRaw BabbageEra))
+  newtype TxBody BabbageEra = MkBabbageTxBody (MemoBytes BabbageTxBodyRaw)
     deriving newtype (Generic, SafeToHash, ToCBOR)
   type TxBodyUpgradeError BabbageEra = BabbageTxBodyUpgradeError
 
@@ -618,10 +607,7 @@ txnetworkid' = btbrNetworkId . getMemoRawType
 -- | Encodes memoized bytes created upon construction.
 instance EncCBOR (TxBody BabbageEra)
 
-instance
-  (Era era, EncCBOR (TxOut era), EncCBOR (TxCert era), EncCBOR (PParamsUpdate era)) =>
-  EncCBOR (BabbageTxBodyRaw era)
-  where
+instance EncCBOR BabbageTxBodyRaw where
   encCBOR
     BabbageTxBodyRaw
       { btbrInputs
@@ -664,10 +650,7 @@ instance
           !> encodeKeyedStrictMaybe 7 btbrAuxDataHash
           !> encodeKeyedStrictMaybe 15 btbrNetworkId
 
-instance
-  (Era era, DecCBOR (TxOut era), DecCBOR (TxCert era), DecCBOR (PParamsUpdate era)) =>
-  DecCBOR (BabbageTxBodyRaw era)
-  where
+instance DecCBOR BabbageTxBodyRaw where
   decCBOR =
     decode $
       SparseKeyed
@@ -676,7 +659,7 @@ instance
         bodyFields
         requiredFields
     where
-      bodyFields :: Word -> Field (BabbageTxBodyRaw era)
+      bodyFields :: Word -> Field BabbageTxBodyRaw
       bodyFields 0 = field (\x tx -> tx {btbrInputs = x}) From
       bodyFields 13 = field (\x tx -> tx {btbrCollateralInputs = x}) From
       bodyFields 18 = field (\x tx -> tx {btbrReferenceInputs = x}) From
@@ -710,7 +693,7 @@ instance
         ]
   {-# INLINE decCBOR #-}
 
-basicBabbageTxBodyRaw :: BabbageTxBodyRaw era
+basicBabbageTxBodyRaw :: BabbageTxBodyRaw
 basicBabbageTxBodyRaw =
   BabbageTxBodyRaw
     mempty

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/Binary/Annotator.hs

@@ -16,13 +16,7 @@ import Cardano.Ledger.Babbage.TxBody
 import Cardano.Ledger.Binary
 import Test.Cardano.Ledger.Alonzo.Binary.Annotator
 
-deriving via
-  Mem (BabbageTxBodyRaw BabbageEra)
-  instance
-    DecCBOR (Annotator (TxBody BabbageEra))
+deriving via Mem BabbageTxBodyRaw instance DecCBOR (Annotator (TxBody BabbageEra))
 
-instance
-  (Era era, DecCBOR (TxOut era), DecCBOR (TxCert era), DecCBOR (PParamsUpdate era)) =>
-  DecCBOR (Annotator (BabbageTxBodyRaw era))
-  where
+instance DecCBOR (Annotator BabbageTxBodyRaw) where
   decCBOR = pure <$> decCBOR

eras/babbage/impl/testlib/Test/Cardano/Ledger/Babbage/TreeDiff.hs

@@ -48,9 +48,7 @@ instance
   ToExpr (BabbageTxOut era)
 
 -- TxBody
-instance
-  (Era era, ToExpr (TxOut era), ToExpr (TxCert era), ToExpr (PParamsUpdate era)) =>
-  ToExpr (BabbageTxBodyRaw era)
+instance ToExpr BabbageTxBodyRaw
 
 instance ToExpr (TxBody BabbageEra)
 

eras/conway/impl/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## 1.20.0.0
 
+* Remove `ConwayTxBody`
+* Removed `era` parameter from `ConwayTxBodyRaw`
 * Add `MkConwayTxBody` and all members of `ConwayTxBodyRaw`:
   (`ConwayTxBodyRaw`, `ctbrAuxDataHash`, `ctbrCerts`, `ctbrCollateralInputs`,
   `ctbrCollateralReturn`, `ctbrCurrentTreasuryValue`, `ctbrFee`, `ctbrMint`, `ctbrNetworkId`,