Remove LedgerPParams

cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs

@@ -939,12 +939,12 @@ genProtocolParameters era = do
 genValidProtocolParameters :: ShelleyBasedEra era -> Gen (LedgerProtocolParameters era)
 genValidProtocolParameters era =
   case era of
-    ShelleyBasedEraShelley -> LedgerPParams era <$> Q.arbitrary
-    ShelleyBasedEraAllegra -> LedgerPParams era <$> Q.arbitrary
-    ShelleyBasedEraMary    -> LedgerPParams era <$> Q.arbitrary
-    ShelleyBasedEraAlonzo  -> LedgerPParams era <$> Q.arbitrary
-    ShelleyBasedEraBabbage -> LedgerPParams era <$> Q.arbitrary
-    ShelleyBasedEraConway  -> LedgerPParams era <$> Q.arbitrary
+    ShelleyBasedEraShelley -> Q.arbitrary
+    ShelleyBasedEraAllegra -> Q.arbitrary
+    ShelleyBasedEraMary    -> Q.arbitrary
+    ShelleyBasedEraAlonzo  -> Q.arbitrary
+    ShelleyBasedEraBabbage -> Q.arbitrary
+    ShelleyBasedEraConway  -> Q.arbitrary
 
 
 genProtocolParametersUpdate :: CardanoEra era -> Gen ProtocolParametersUpdate

cardano-api/internal/Cardano/Api/Convenience/Query.hs

@@ -118,7 +118,7 @@ queryStateForBalancedTx era allTxIns certs = runExceptT $ do
           & onLeft (left . QceUnsupportedNtcVersion)
           & onLeft (left . QueryEraMismatch)
 
-  pure (utxo, createLedgerProtocolParameters sbe pparams, eraHistory, systemStart, stakePools, stakeDelegDeposits)
+  pure (utxo, pparams, eraHistory, systemStart, stakePools, stakeDelegDeposits)
 
 -- | Query the node to determine which era it is in.
 determineEra

cardano-api/internal/Cardano/Api/Fees.hs

@@ -495,7 +495,7 @@ evaluateTransactionExecutionUnitsShelley :: forall era. ()
   -> L.Tx (ShelleyLedgerEra era)
   -> Either TransactionValidityError
             (Map ScriptWitnessIndex (Either ScriptExecutionError ExecutionUnits))
-evaluateTransactionExecutionUnitsShelley sbe systemstart epochInfo (LedgerPParams _ pp) utxo tx' =
+evaluateTransactionExecutionUnitsShelley sbe systemstart epochInfo pp utxo tx' =
         case sbe of
           ShelleyBasedEraShelley -> evalPreAlonzo
           ShelleyBasedEraAllegra -> evalPreAlonzo
@@ -909,7 +909,7 @@ makeTransactionBodyAutoBalance
   -> AddressInEra era -- ^ Change address
   -> Maybe Word       -- ^ Override key witnesses
   -> Either TxBodyErrorAutoBalance (BalancedTxBody era)
-makeTransactionBodyAutoBalance systemstart history lpp@(LedgerPParams _ pp) poolids stakeDelegDeposits
+makeTransactionBodyAutoBalance systemstart history pp poolids stakeDelegDeposits
                             utxo txbodycontent changeaddr mnkeys = do
     -- Our strategy is to:
     -- 1. evaluate all the scripts to get the exec units, update with ex units
@@ -927,7 +927,7 @@ makeTransactionBodyAutoBalance systemstart history lpp@(LedgerPParams _ pp) pool
     exUnitsMap <- first TxBodyErrorValidityInterval $
                     evaluateTransactionExecutionUnits
                       systemstart history
-                      lpp
+                      pp
                       utxo
                       txbody0
 

cardano-api/internal/Cardano/Api/ProtocolParameters.hs

@@ -34,7 +34,7 @@ module Cardano.Api.ProtocolParameters (
     EpochNo,
 
     -- * The updatable protocol parameters
-    LedgerProtocolParameters(..),
+    LedgerProtocolParameters,
     EraBasedProtocolParametersUpdate(..),
     AlonzoOnwardsPParams(..),
     CommonProtocolParametersUpdate(..),
@@ -43,7 +43,6 @@ module Cardano.Api.ProtocolParameters (
     ShelleyToAlonzoPParams'(..),
     IntroducedInBabbagePParams(..),
     createEraBasedProtocolParamUpdate,
-    createLedgerProtocolParameters,
     convertToLedgerProtocolParameters,
     createPParams,
 
@@ -149,34 +148,16 @@ import           Text.PrettyBy.Default (display)
 
 -- -----------------------------------------------------------------------------
 -- Era based ledger protocol parameters
---
-data LedgerProtocolParameters era where
-  LedgerPParams
-    :: EraPParams (ShelleyLedgerEra era)
-    => ShelleyBasedEra era
-    -> (Ledger.PParams (ShelleyLedgerEra era))
-    -> LedgerProtocolParameters era
-
-
-deriving instance Show (LedgerProtocolParameters era )
-deriving instance Eq (LedgerProtocolParameters era)
-
-createLedgerProtocolParameters
-  :: ShelleyBasedEra era
-  -> Ledger.PParams (ShelleyLedgerEra era)
-  -> LedgerProtocolParameters era
-createLedgerProtocolParameters sbe pp =
-  shelleyBasedEraConstraints sbe $ LedgerPParams sbe pp
 
+type LedgerProtocolParameters era = Ledger.PParams (ShelleyLedgerEra era)
 
 -- TODO: Conway era - remove me when we begin relying on the JSON
 -- instances of Ledger.PParams
 convertToLedgerProtocolParameters
   :: ShelleyBasedEra era
   -> ProtocolParameters
   -> Either ProtocolParametersConversionError (LedgerProtocolParameters era)
-convertToLedgerProtocolParameters sbe pp =
-  createLedgerProtocolParameters sbe <$> toLedgerPParams sbe pp
+convertToLedgerProtocolParameters = toLedgerPParams
 
 createPParams
   :: EraPParams (ShelleyLedgerEra era)

cardano-api/internal/Cardano/Api/TxBody.hs

@@ -15,6 +15,7 @@
 {-# LANGUAGE TypeApplications #-}
 {-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE TypeOperators #-}
+{-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE ViewPatterns #-}
 
 {- HLINT ignore "Avoid lambda using `infix`" -}
@@ -260,6 +261,7 @@ import qualified Data.ByteString.Lazy as LBS
 import           Data.Foldable (for_, toList)
 import           Data.Function (on)
 import           Data.Functor (($>))
+import           Data.Functor.Identity
 import           Data.List (intercalate, sortBy)
 import qualified Data.List as List
 import qualified Data.List.NonEmpty as NonEmpty
@@ -1763,7 +1765,9 @@ data TxBodyContent build era =
        txGovernanceActions :: TxGovernanceActions era,
        txVotingProcedures  :: Maybe (Featured ConwayEraOnwards era (VotingProcedures era))
      }
-     deriving (Eq, Show)
+
+deriving instance (IsShelleyBasedEra era, Eq (Ledger.PParamsHKD Identity (ShelleyLedgerEra era))) => Eq (TxBodyContent build era)
+deriving instance (IsShelleyBasedEra era, Show (Ledger.PParamsHKD Identity (ShelleyLedgerEra era))) => Show (TxBodyContent build era)
 
 defaultTxBodyContent :: IsCardanoEra era => TxBodyContent BuildTx era
 defaultTxBodyContent = TxBodyContent
@@ -3570,16 +3574,17 @@ convScriptData era txOuts scriptWitnesses =
       in TxBodyScriptData scriptDataInEra datums redeemers
 
 convPParamsToScriptIntegrityHash
-  :: L.AlonzoEraPParams (ShelleyLedgerEra era)
+  :: forall era. (IsShelleyBasedEra era, L.AlonzoEraPParams (ShelleyLedgerEra era))
   => BuildTxWith BuildTx (Maybe (LedgerProtocolParameters era))
   -> Alonzo.Redeemers (ShelleyLedgerEra era)
   -> Alonzo.TxDats (ShelleyLedgerEra era)
   -> Set Alonzo.Language
   -> Either TxBodyError (StrictMaybe (L.ScriptIntegrityHash (Ledger.EraCrypto (ShelleyLedgerEra era))))
 convPParamsToScriptIntegrityHash txProtocolParams redeemers datums languages = do
+  let sbe = shelleyBasedEra @era
   lang <- case txProtocolParams of
                BuildTxWith Nothing -> return Nothing
-               BuildTxWith (Just (LedgerPParams sbe pp)) ->
+               BuildTxWith (Just pp) ->
                  case sbe of
                    ShelleyBasedEraShelley ->
                      return Nothing

cardano-api/src/Cardano/Api/Shelley.hs

@@ -110,7 +110,7 @@ module Cardano.Api.Shelley
     fromShelleyMetadatum,
 
     -- * Protocol parameters
-    LedgerProtocolParameters(..),
+    LedgerProtocolParameters,
     EraBasedProtocolParametersUpdate(..),
     CommonProtocolParametersUpdate(..),
     AlonzoOnwardsPParams(..),
@@ -120,7 +120,6 @@ module Cardano.Api.Shelley
     IntroducedInBabbagePParams(..),
     createEraBasedProtocolParamUpdate,
     convertToLedgerProtocolParameters,
-    createLedgerProtocolParameters,
 
     ProtocolParameters(..),
     checkProtocolParameters,