Removed the associated type family PParamsUpdate from UsesPParams class

That type famiy was made redundant when we cadded the Core.PParamsDelta type
family, but was never removed.

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

@@ -146,16 +146,11 @@ type instance Core.PParams (AlonzoEra c) = PParams (AlonzoEra c)
 
 type instance Core.Witnesses (AlonzoEra c) = TxWitness (AlonzoEra c)
 
-instance CC.Crypto c => UsesValue (AlonzoEra c)
+type instance Core.PParamsDelta (AlonzoEra c) = PParamsUpdate (AlonzoEra c)
 
-instance
-  (CC.Crypto c) =>
-  UsesPParams (AlonzoEra c)
-  where
-  type
-    PParamsDelta (AlonzoEra c) =
-      PParamsUpdate (AlonzoEra c)
+instance CC.Crypto c => UsesValue (AlonzoEra c)
 
+instance (CC.Crypto c) => UsesPParams (AlonzoEra c) where
   mergePPUpdates _ = updatePParams
 
 instance CC.Crypto c => ValidateAuxiliaryData (AlonzoEra c) c where
@@ -235,3 +230,5 @@ type instance Core.EraRule "UPEC" (AlonzoEra c) = Shelley.UPEC (AlonzoEra c)
 type Self c = AlonzoEra c
 
 type Value era = V.Value (EraModule.Crypto era)
+
+type PParamsDelta era = PParamsUpdate era

alonzo/impl/src/Cardano/Ledger/Alonzo/PParams.hs

@@ -87,7 +87,7 @@ import Shelley.Spec.Ledger.BaseTypes
   )
 import Shelley.Spec.Ledger.Orphans ()
 import Shelley.Spec.Ledger.PParams (HKD, ProtVer (..))
-import qualified Shelley.Spec.Ledger.PParams as Shelley (PParams, PParams' (..))
+import qualified Shelley.Spec.Ledger.PParams as Shelley (PParams' (..))
 import Shelley.Spec.Ledger.Serialization
   ( FromCBORGroup (..),
     ToCBORGroup (..),

alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Ledger.hs

@@ -26,7 +26,6 @@ import Cardano.Ledger.Alonzo.Tx (IsValidating (..), ValidatedTx (..))
 import Cardano.Ledger.Coin (Coin)
 import qualified Cardano.Ledger.Core as Core
 import Cardano.Ledger.Era (Crypto, Era, TxInBlock)
-import Cardano.Ledger.Shelley.Constraints (PParamsDelta)
 import Control.State.Transition
   ( Assertion (..),
     AssertionViolation (..),
@@ -118,7 +117,7 @@ instance
     Show (Core.AuxiliaryData era),
     Show (Core.PParams era),
     Show (Core.Value era),
-    Show (PParamsDelta era),
+    Show (Core.PParamsDelta era),
     DSignable (Crypto era) (Hash (Crypto era) EraIndependentTxBody),
     Era era,
     TxInBlock era ~ ValidatedTx era,

alonzo/impl/src/Cardano/Ledger/Alonzo/Rules/Utxos.hs

@@ -33,7 +33,6 @@ import Cardano.Ledger.Coin (Coin)
 import qualified Cardano.Ledger.Core as Core
 import Cardano.Ledger.Era (Crypto, Era)
 import Cardano.Ledger.Mary.Value (Value)
-import Cardano.Ledger.Shelley.Constraints (PParamsDelta)
 import qualified Cardano.Ledger.Val as Val
 import Control.Iterate.SetAlgebra (eval, (∪), (⋪), (◁))
 import Control.State.Transition.Extended
@@ -65,8 +64,8 @@ instance
   ( Era era,
     Eq (Core.PParams era),
     Show (Core.PParams era),
-    Show (PParamsDelta era),
-    Eq (PParamsDelta era),
+    Show (Core.PParamsDelta era),
+    Eq (Core.PParamsDelta era),
     Embed (Core.EraRule "PPUP" era) (UTXOS era),
     Environment (Core.EraRule "PPUP" era) ~ PPUPEnv era,
     State (Core.EraRule "PPUP" era) ~ PPUPState era,

alonzo/impl/src/Cardano/Ledger/Alonzo/Tx.hs

@@ -122,7 +122,6 @@ import Cardano.Ledger.SafeHash
     SafeToHash,
     hashAnnotated,
   )
-import Cardano.Ledger.Shelley.Constraints
 import Cardano.Ledger.Val (Val (coin, (<+>), (<×>)))
 import Control.DeepSeq (NFData (..))
 import qualified Data.ByteString.Lazy as LBS (toStrict)
@@ -176,7 +175,7 @@ deriving instance
     Eq (Core.Script era),
     Eq (Core.TxBody era),
     Eq (Core.Value era),
-    Eq (PParamsDelta era),
+    Eq (Core.PParamsDelta era),
     Compactible (Core.Value era)
   ) =>
   Eq (ValidatedTxRaw era)
@@ -188,7 +187,7 @@ deriving instance
     Show (Core.Script era),
     Show (Core.TxBody era),
     Show (Core.Value era),
-    Show (PParamsDelta era)
+    Show (Core.PParamsDelta era)
   ) =>
   Show (ValidatedTxRaw era)
 
@@ -198,7 +197,7 @@ instance
     NoThunks (Core.Script era),
     NoThunks (Core.TxBody era),
     NoThunks (Core.Value era),
-    NoThunks (PParamsDelta era)
+    NoThunks (Core.PParamsDelta era)
   ) =>
   NoThunks (ValidatedTxRaw era)
 
@@ -211,7 +210,7 @@ deriving newtype instance
     Eq (Core.Script era),
     Eq (Core.TxBody era),
     Eq (Core.Value era),
-    Eq (PParamsDelta era),
+    Eq (Core.PParamsDelta era),
     Compactible (Core.Value era)
   ) =>
   Eq (ValidatedTx era)
@@ -223,7 +222,7 @@ deriving newtype instance
     Show (Core.Script era),
     Show (Core.TxBody era),
     Show (Core.Value era),
-    Show (PParamsDelta era)
+    Show (Core.PParamsDelta era)
   ) =>
   Show (ValidatedTx era)
 
@@ -233,7 +232,7 @@ deriving newtype instance
     NoThunks (Core.Script era),
     NoThunks (Core.TxBody era),
     NoThunks (Core.Value era),
-    NoThunks (PParamsDelta era)
+    NoThunks (Core.PParamsDelta era)
   ) =>
   NoThunks (ValidatedTx era)
 
@@ -326,8 +325,8 @@ instance HasField "wits" (ValidatedTx era) (TxWitness era) where
 -- =========================================================
 -- Figure 2: Definitions for Transactions
 
-getCoin :: UsesValue era => TxOut era -> Coin
-getCoin (TxOut _ v _) = coin v
+getCoin :: (Era era) => TxOut era -> Coin
+getCoin txout = coin (getField @"value" txout)
 
 -- ========================================================================
 -- A WitnessPPDataHash is the hash of two things. The first part comes from

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

@@ -68,6 +68,7 @@ import Cardano.Binary
 import Cardano.Ledger.Alonzo.Data (AuxiliaryDataHash (..), DataHash)
 import Cardano.Ledger.Coin (Coin)
 import Cardano.Ledger.Compactible
+import Cardano.Ledger.Core (PParamsDelta)
 import qualified Cardano.Ledger.Core as Core
 import qualified Cardano.Ledger.Crypto as CC
 import Cardano.Ledger.Era (Crypto, Era)
@@ -100,7 +101,6 @@ import Cardano.Ledger.SafeHash
     SafeHash,
     SafeToHash,
   )
-import Cardano.Ledger.Shelley.Constraints (PParamsDelta)
 import Cardano.Ledger.ShelleyMA.Timelocks (ValidityInterval (..), ppValidityInterval)
 import Cardano.Ledger.Val
   ( DecodeNonNegative,

alonzo/impl/test/lib/Test/Cardano/Ledger/Alonzo/EraGenInstance.hs

@@ -22,25 +22,26 @@ module Test.Cardano.Ledger.Alonzo.EraGenInstance where
 
 -- Type families and others that vary from Era to Era
 
--- Where type family and Era instances reside.
-import Cardano.Ledger.Alonzo (AlonzoEra)
 -- Alonzo Era types
 
+-- Mary Era types stull used in Alonzo
+
+-- Plutus types used in Alonzo
+
+-- Where type family and Era instances reside.
+import Cardano.Ledger.Alonzo (AlonzoEra)
 import Cardano.Ledger.Alonzo.Data as Alonzo (AuxiliaryData (..), Data (..))
 import qualified Cardano.Ledger.Alonzo.PParams as Alonzo (PParams, extendPP, retractPP, _adaPerUTxOWord)
 import Cardano.Ledger.Alonzo.Scripts as Alonzo (ExUnits (..), Prices (..), Script (..))
 import Cardano.Ledger.Alonzo.Tx
 import Cardano.Ledger.Alonzo.TxBody
 import Cardano.Ledger.AuxiliaryData (AuxiliaryDataHash)
 import Cardano.Ledger.Coin (Coin (..))
-import Cardano.Ledger.Core as Core (PParams, Script)
+import Cardano.Ledger.Core as Core (PParams, PParamsDelta, Script)
 import qualified Cardano.Ledger.Crypto as CC
 import Cardano.Ledger.Era (Crypto, Era (..))
 import Cardano.Ledger.Mary (MaryEra)
--- Mary Era types stull used in Alonzo
-
 import Cardano.Ledger.Mary.Value (Value, policies)
-import Cardano.Ledger.Shelley.Constraints (UsesPParams (PParamsDelta))
 import Cardano.Ledger.ShelleyMA.AuxiliaryData as Mary (pattern AuxiliaryData)
 import Cardano.Ledger.ShelleyMA.Rules.Utxo (scaledMinDeposit)
 import Cardano.Ledger.ShelleyMA.Timelocks (Timelock (..), ValidityInterval (..))
@@ -51,7 +52,6 @@ import Data.Map as Map
 import Data.Proxy (Proxy (..))
 import Data.Sequence.Strict (StrictSeq (Empty, (:<|)), (<|), (><))
 import Data.Set as Set
--- Plutus types used in Alonzo
 import qualified PlutusTx as Plutus
 import Shelley.Spec.Ledger.BaseTypes (Network (..), StrictMaybe (..))
 import Shelley.Spec.Ledger.PParams (Update)
@@ -65,6 +65,15 @@ import Test.Shelley.Spec.Ledger.Generator.EraGen (EraGen (..))
 import Test.Shelley.Spec.Ledger.Generator.ScriptClass (Quantifier (..), ScriptClass (..))
 import Test.Shelley.Spec.Ledger.Generator.Update (genM, genShelleyPParamsDelta)
 
+{-
+import Test.Shelley.Spec.Ledger.ConcreteCryptoTypes (C_Crypto)
+import Cardano.Ledger.ShelleyMA(ShelleyMAEra,MaryOrAllegra(..))
+import Cardano.Ledger.Mary (MaryEra)
+import Cardano.Ledger.Allegra (AllegraEra)
+
+import Cardano.Ledger.Shelley (ShelleyEra)
+-}
+
 -- ================================================================
 
 {------------------------------------------------------------------------------
@@ -177,7 +186,7 @@ genAlonzoPParamsDelta ::
   Mock c =>
   Constants ->
   Alonzo.PParams (AlonzoEra c) ->
-  Gen (PParamsDelta (AlonzoEra c))
+  Gen (Core.PParamsDelta (AlonzoEra c))
 genAlonzoPParamsDelta constants pp = do
   shelleypp <- genShelleyPParamsDelta @(MaryEra c) constants (Alonzo.retractPP (Coin 100) pp)
   ada <- genM (Coin <$> choose (1, 5))

example-shelley/src/Cardano/Ledger/Example.hs

@@ -119,6 +119,8 @@ type instance Core.AuxiliaryData (ExampleEra c) = Metadata (ExampleEra c)
 
 type instance Core.PParams (ExampleEra c) = SPP.PParams (ExampleEra c)
 
+type instance Core.PParamsDelta (ExampleEra c) = SPP.PParamsUpdate (ExampleEra c)
+
 type instance Core.Witnesses (ExampleEra c) = WitnessSet (ExampleEra c)
 
 --------------------------------------------------------------------------------
@@ -129,10 +131,6 @@ instance
   (CryptoClass.Crypto c) =>
   UsesPParams (ExampleEra c)
   where
-  type
-    PParamsDelta (ExampleEra c) =
-      SPP.PParamsUpdate (ExampleEra c)
-
   mergePPUpdates _ = SPP.updatePParams
 
 nativeMultiSigTag :: BS.ByteString

shelley-ma/impl/src/Cardano/Ledger/ShelleyMA.hs

@@ -66,6 +66,8 @@ import qualified Shelley.Spec.Ledger.PParams as Shelley
 import Shelley.Spec.Ledger.Scripts (ScriptHash)
 import Shelley.Spec.Ledger.Tx (Tx, TxOut (..), WitVKey, WitnessSet)
 
+-- ========================================
+
 -- | The Shelley Mary/Allegra eras
 --   The uninhabited type that indexes both the Mary and Allegra Eras.
 data ShelleyMAEra (ma :: MaryOrAllegra) c
@@ -118,14 +120,10 @@ instance CryptoClass.Crypto c => UsesTxOut (ShelleyMAEra 'Mary c) where
 instance CryptoClass.Crypto c => UsesTxOut (ShelleyMAEra 'Allegra c) where
   makeTxOut _ a v = TxOut a v
 
-instance
-  (MAClass ma c) =>
-  UsesPParams (ShelleyMAEra ma c)
-  where
-  type
-    PParamsDelta (ShelleyMAEra ma c) =
-      Shelley.PParamsUpdate (ShelleyMAEra ma c)
+instance CryptoClass.Crypto c => UsesPParams (ShelleyMAEra 'Mary c) where
+  mergePPUpdates _ = Shelley.updatePParams
 
+instance CryptoClass.Crypto c => UsesPParams (ShelleyMAEra 'Allegra c) where
   mergePPUpdates _ = Shelley.updatePParams
 
 --------------------------------------------------------------------------------
@@ -158,6 +156,10 @@ type instance
   Core.Witnesses (ShelleyMAEra (ma :: MaryOrAllegra) c) =
     WitnessSet (ShelleyMAEra (ma :: MaryOrAllegra) c)
 
+type instance
+  Core.PParamsDelta (ShelleyMAEra (ma :: MaryOrAllegra) c) =
+    Shelley.PParamsUpdate (ShelleyMAEra (ma :: MaryOrAllegra) c)
+
 --------------------------------------------------------------------------------
 -- Ledger data instances
 --------------------------------------------------------------------------------

shelley-ma/impl/src/Cardano/Ledger/ShelleyMA/TxBody.hs

@@ -49,7 +49,7 @@ where
 import Cardano.Binary (Annotator, FromCBOR (..), ToCBOR (..))
 import Cardano.Ledger.AuxiliaryData (AuxiliaryDataHash)
 import Cardano.Ledger.Coin (Coin (..))
-import Cardano.Ledger.Core (Script, Value)
+import Cardano.Ledger.Core (PParamsDelta, Script, Value)
 import qualified Cardano.Ledger.Core as Core
 import Cardano.Ledger.Era (Crypto, Era)
 import Cardano.Ledger.Hashes (EraIndependentTxBody)
@@ -69,7 +69,7 @@ import Cardano.Ledger.Pretty
     ppWdrl,
   )
 import Cardano.Ledger.SafeHash (HashAnnotated, SafeToHash)
-import Cardano.Ledger.Shelley.Constraints (PParamsDelta, TransValue)
+import Cardano.Ledger.Shelley.Constraints (TransValue)
 import Cardano.Ledger.ShelleyMA.Timelocks (ValidityInterval (..), ppValidityInterval)
 import Cardano.Ledger.Val
   ( DecodeMint (..),

shelley-ma/shelley-ma-test/test/Test/Cardano/Ledger/ShelleyMA/Serialisation/Golden/Encoding.hs

@@ -17,7 +17,7 @@ import qualified Cardano.Ledger.Core as Core
 import qualified Cardano.Ledger.Crypto as CC (Crypto)
 import Cardano.Ledger.Era (Crypto (..), ValidateScript (hashScript))
 import Cardano.Ledger.Mary.Value (AssetName (..), PolicyID (..), Value (..))
-import Cardano.Ledger.Shelley.Constraints (PParamsDelta)
+import Cardano.Ledger.Core(PParamsDelta)
 import Cardano.Ledger.ShelleyMA.AuxiliaryData (pattern AuxiliaryData)
 import Cardano.Ledger.ShelleyMA.Timelocks
   ( Timelock (..),

shelley/chain-and-ledger/executable-spec/src/Cardano/Ledger/Pretty.hs

@@ -23,11 +23,11 @@ import qualified Cardano.Crypto.Hash as Hash
 import Cardano.Ledger.AuxiliaryData (AuxiliaryDataHash (..))
 import Cardano.Ledger.Coin (Coin (..), DeltaCoin (..))
 import Cardano.Ledger.Compactible (Compactible (..))
+import Cardano.Ledger.Core (PParamsDelta)
 import qualified Cardano.Ledger.Core as Core
 import Cardano.Ledger.Crypto (Crypto)
 import Cardano.Ledger.Era (Era)
 import Cardano.Ledger.SafeHash (SafeHash, extractHash)
-import Cardano.Ledger.Shelley.Constraints (UsesPParams (PParamsDelta))
 import Cardano.Slotting.Slot (WithOrigin (..))
 import Cardano.Slotting.Time (SystemStart (SystemStart))
 import Codec.Binary.Bech32

shelley/chain-and-ledger/executable-spec/src/Cardano/Ledger/Shelley.hs

@@ -20,7 +20,7 @@ module Cardano.Ledger.Shelley
     Script,
     AuxiliaryData,
     PParams,
-    PParamsDelta,
+    Core.PParamsDelta,
     Tx,
     Witnesses,
     nativeMultiSigTag,
@@ -52,8 +52,7 @@ import qualified Shelley.Spec.Ledger.BlockChain as Shelley
     txSeqTxns,
   )
 import Shelley.Spec.Ledger.Metadata (Metadata (Metadata), validMetadatum)
-import Shelley.Spec.Ledger.PParams (PParamsUpdate, updatePParams)
-import qualified Shelley.Spec.Ledger.PParams as SPP (PParams, PParamsUpdate)
+import Shelley.Spec.Ledger.PParams (PParams, PParamsUpdate, updatePParams)
 import Shelley.Spec.Ledger.Scripts (MultiSig)
 import Shelley.Spec.Ledger.Tx
   ( WitnessSet,
@@ -72,7 +71,6 @@ instance CryptoClass.Crypto c => UsesTxOut (ShelleyEra c) where
   makeTxOut _ a v = STx.TxOut a v
 
 instance CryptoClass.Crypto c => UsesPParams (ShelleyEra c) where
-  type PParamsDelta (ShelleyEra c) = PParamsUpdate (ShelleyEra c)
   mergePPUpdates _ = updatePParams
 
 --------------------------------------------------------------------------------
@@ -89,11 +87,11 @@ type instance Core.Script (ShelleyEra c) = MultiSig c
 
 type instance Core.AuxiliaryData (ShelleyEra c) = Metadata (ShelleyEra c)
 
-type instance Core.PParams (ShelleyEra c) = SPP.PParams (ShelleyEra c)
+type instance Core.PParams (ShelleyEra c) = PParams (ShelleyEra c)
 
 type instance Core.Witnesses (ShelleyEra c) = WitnessSet (ShelleyEra c)
 
-type instance Core.PParamsDelta (ShelleyEra c) = SPP.PParamsUpdate (ShelleyEra c)
+type instance Core.PParamsDelta (ShelleyEra c) = PParamsUpdate (ShelleyEra c)
 
 --------------------------------------------------------------------------------
 -- Ledger data instances
@@ -142,6 +140,4 @@ type TxOut era = STx.TxOut era
 
 type TxBody era = STx.TxBody era
 
-type PParams era = SPP.PParams era
-
 type Witnesses era = WitnessSet (E.Crypto era)