Add PParams for Conway

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

@@ -27,6 +27,7 @@ module Cardano.Ledger.Babbage.PParams (
  encodeLangViews,
  coinsPerUTxOWordToCoinsPerUTxOByte,
  coinsPerUTxOByteToCoinsPerUTxOWord,
+ babbagePParamsHKDPairs,
 )
 where
 
@@ -233,7 +234,6 @@ instance Crypto c => BabbageEraPParams (BabbageEra c) where
 instance Crypto c => EraGovernance (BabbageEra c) where
  type GovernanceState (BabbageEra c) = ShelleyPPUPState (BabbageEra c)
  emptyGovernanceState = ShelleyPPUPState emptyPPPUpdates emptyPPPUpdates
-
  getProposedPPUpdates = Just . proposals
 
 instance Era era => EncCBOR (BabbagePParams Identity era) where

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

@@ -1,21 +1,38 @@
+{-# LANGUAGE AllowAmbiguousTypes #-}
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeFamilies #-}
 {-# LANGUAGE UndecidableInstances #-}
 {-# LANGUAGE UndecidableSuperClasses #-}
 
 module Cardano.Ledger.Conway.Core (
  module X,
  ConwayEraTxBody (..),
+ ConwayEraPParams (..),
 )
 where
 
 import Cardano.Ledger.Babbage.Core as X
+import Cardano.Ledger.BaseTypes (EpochNo)
+import Cardano.Ledger.Coin (Coin)
 import Cardano.Ledger.Conway.Governance (ProposalProcedure, VotingProcedure)
+import Cardano.Ledger.HKD (HKD, HKDFunctor)
+import Data.Map.Strict (Map)
 import Data.Sequence.Strict (StrictSeq)
 import Lens.Micro (Lens')
+import Numeric.Natural (Natural)
 
 class BabbageEraTxBody era => ConwayEraTxBody era where
  votingProceduresTxBodyL :: Lens' (TxBody era) (StrictSeq (VotingProcedure era))
  proposalProceduresTxBodyL :: Lens' (TxBody era) (StrictSeq (ProposalProcedure era))
+
+class BabbageEraPParams era => ConwayEraPParams era where
+ hkdVotingThresholdsL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f (Map Natural Natural))
+ hkdMinCCSizeL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f Natural)
+ hkdCCTermLimitL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f Natural)
+ hkdGovExpirationL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f Natural)
+ hkdGovDepositL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f Coin)
+ hkdDRepDepositL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f Coin)
+ hkdDRepActivityL :: HKDFunctor f => Lens' (PParamsHKD f era) (HKD f EpochNo)

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

@@ -60,8 +60,6 @@ import Cardano.Ledger.Binary.Coders (
  (<!),
  )
 import Cardano.Ledger.Coin (Coin (..))
-import Cardano.Ledger.Conway.Era (ConwayEra)
-import Cardano.Ledger.Conway.PParams ()
 import Cardano.Ledger.Core
 import Cardano.Ledger.Credential (Credential)
 import Cardano.Ledger.Crypto (Crypto)
@@ -445,7 +443,10 @@ deriving instance Eq (PParams era) => Eq (EnactState era)
 
 deriving instance Show (PParams era) => Show (EnactState era)
 
-instance EraPParams era => Default (EnactState era) where
+instance
+ (EraPParams era, Default (SafeHash (EraCrypto era) ByteString)) =>
+ Default (EnactState era)
+ where
  def =
  EnactState
  def
@@ -493,7 +494,9 @@ data RatifyState era = RatifyState
  }
  deriving (Generic, Eq, Show)
 
-instance EraPParams era => Default (RatifyState era)
+instance
+ (Default (SafeHash (EraCrypto era) ByteString), EraPParams era) =>
+ Default (RatifyState era)
 
 instance EraPParams era => DecCBOR (RatifyState era) where
  decCBOR =
@@ -568,7 +571,9 @@ instance EraPParams era => ToCBOR (ConwayGovernance era) where
 instance EraPParams era => FromCBOR (ConwayGovernance era) where
  fromCBOR = fromEraCBOR @era
 
-instance EraPParams era => Default (ConwayGovernance era)
+instance
+ (Default (SafeHash (EraCrypto era) ByteString), EraPParams era) =>
+ Default (ConwayGovernance era)
 
 instance EraPParams era => NFData (ConwayGovernance era)
 
@@ -585,6 +590,3 @@ toConwayGovernancePairs cg@(ConwayGovernance _ _ _) =
  , "ratify" .= cgRatify
  , "voterRoles" .= cgVoterRoles
  ]
-
-instance Crypto c => EraGovernance (ConwayEra c) where
- type GovernanceState (ConwayEra c) = ConwayGovernance (ConwayEra c)