Re-arrange Era instances

eras/allegra/impl/src/Cardano/Ledger/Allegra/Era.hs

@@ -19,16 +19,9 @@ module Cardano.Ledger.Allegra.Era (
 import Cardano.Ledger.Coin (Coin)
 import Cardano.Ledger.Genesis (EraGenesis, NoGenesis)
 import Cardano.Ledger.Internal.Era (AllegraEra)
-import Cardano.Ledger.Shelley (ShelleyEra)
 import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.Rules
 
-instance Era AllegraEra where
-  type PreviousEra AllegraEra = ShelleyEra
-  type ProtVerLow AllegraEra = 3
-
-  eraName = "Allegra"
-
 instance EraGenesis AllegraEra
 
 --------------------------------------------------------------------------------

eras/allegra/impl/src/Cardano/Ledger/Allegra/Rules/Utxo.hs

@@ -302,7 +302,7 @@ instance
   , Environment (EraRule "PPUP" era) ~ PpupEnv era
   , State (EraRule "PPUP" era) ~ ShelleyGovState era
   , Signal (EraRule "PPUP" era) ~ StrictMaybe (Update era)
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , Eq (EraRuleFailure "PPUP" era)
   , Show (EraRuleFailure "PPUP" era)
   , EraRule "UTXO" era ~ AllegraUTXO era

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

@@ -17,19 +17,12 @@ module Cardano.Ledger.Alonzo.Era (
 ) where
 
 import Cardano.Ledger.Internal.Era (AlonzoEra)
-import Cardano.Ledger.Mary (MaryEra, MaryValue)
+import Cardano.Ledger.Mary (MaryValue)
 import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.Rules
 
 -- =====================================================
 
-instance Era AlonzoEra where
-  type PreviousEra AlonzoEra = MaryEra
-  type ProtVerLow AlonzoEra = 5
-  type ProtVerHigh AlonzoEra = 6
-
-  eraName = "Alonzo"
-
 type instance Value AlonzoEra = MaryValue
 
 -------------------------------------------------------------------------------

eras/alonzo/impl/src/Cardano/Ledger/Alonzo/Plutus/TxInfo.hs

@@ -320,7 +320,7 @@ transValue (MaryValue c m) = transCoinToValue c <> transMultiAsset m
 -- =============================================
 -- translate fields like TxCert, Withdrawals, and similar
 
-transTxCert :: (ShelleyEraTxCert era, ProtVerAtMost era 8) => TxCert era -> PV1.DCert
+transTxCert :: (ShelleyEraTxCert era, AtMostEra "Babbage" era) => TxCert era -> PV1.DCert
 transTxCert txCert =
   case transTxCertCommon txCert of
     Just cert -> cert

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

@@ -165,7 +165,7 @@ instance
   , Environment (EraRule "DELEGS" era) ~ DelegsEnv era
   , State (EraRule "DELEGS" era) ~ CertState era
   , Signal (EraRule "DELEGS" era) ~ Seq (TxCert era)
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , EraCertState era
   ) =>
   STS (AlonzoLEDGER era)

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

@@ -474,7 +474,7 @@ utxoTransition ::
   forall era.
   ( EraUTxO era
   , AlonzoEraTx era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , EraRule "UTXO" era ~ AlonzoUTXO era
   , InjectRuleFailure "UTXO" ShelleyUtxoPredFailure era
   , InjectRuleFailure "UTXO" AlonzoUtxoPredFailure era
@@ -571,7 +571,7 @@ instance
   , InjectRuleFailure "UTXO" ShelleyUtxoPredFailure era
   , InjectRuleFailure "UTXO" AlonzoUtxoPredFailure era
   , InjectRuleFailure "UTXO" AllegraUtxoPredFailure era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , EraCertState era
   , SafeToHash (TxWits era)
   ) =>

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

@@ -141,12 +141,12 @@ type ScriptIntegrityHash = SafeHash EraIndependentScriptIntegrity
 class (MaryEraTxBody era, AlonzoEraTxOut era) => AlonzoEraTxBody era where
   collateralInputsTxBodyL :: Lens' (TxBody era) (Set TxIn)
 
-  reqSignerHashesTxBodyL :: ProtVerAtMost era 11 => Lens' (TxBody era) (Set (KeyHash 'Witness))
+  reqSignerHashesTxBodyL :: AtMostEra "Conway" era => Lens' (TxBody era) (Set (KeyHash 'Witness))
 
   reqSignerHashesTxBodyG ::
     SimpleGetter (TxBody era) (Set (KeyHash Witness))
   default reqSignerHashesTxBodyG ::
-    ProtVerAtMost era 11 => SimpleGetter (TxBody era) (Set (KeyHash Witness))
+    AtMostEra "Conway" era => SimpleGetter (TxBody era) (Set (KeyHash Witness))
   reqSignerHashesTxBodyG = reqSignerHashesTxBodyL
 
   scriptIntegrityHashTxBodyL ::

eras/alonzo/test-suite/src/Test/Cardano/Ledger/Alonzo/Trace.hs

@@ -63,7 +63,7 @@ instance
   , Environment (EraRule "DELEGS" era) ~ DelegsEnv era
   , State (EraRule "DELEGS" era) ~ CertState era
   , Signal (EraRule "DELEGS" era) ~ Seq (TxCert era)
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , EraCertState era
   , Crypto c
   ) =>

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

@@ -14,7 +14,6 @@ module Cardano.Ledger.Babbage.Era (
   BabbageLEDGER,
 ) where
 
-import Cardano.Ledger.Alonzo (AlonzoEra)
 import Cardano.Ledger.Alonzo.Rules (AlonzoBBODY)
 import Cardano.Ledger.Core
 import Cardano.Ledger.Genesis (EraGenesis, NoGenesis)
@@ -34,13 +33,6 @@ import Cardano.Ledger.Shelley.Rules (
 
 -- =====================================================
 
-instance Era BabbageEra where
-  type PreviousEra BabbageEra = AlonzoEra
-  type ProtVerLow BabbageEra = 7
-  type ProtVerHigh BabbageEra = 8
-
-  eraName = "Babbage"
-
 instance EraGenesis BabbageEra
 
 type instance TranslationContext BabbageEra = NoGenesis BabbageEra

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

@@ -117,7 +117,7 @@ instance
   , Environment (EraRule "DELEGS" era) ~ DelegsEnv era
   , State (EraRule "DELEGS" era) ~ CertState era
   , Signal (EraRule "DELEGS" era) ~ Seq (TxCert era)
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , EraCertState era
   ) =>
   STS (BabbageLEDGER era)

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

@@ -31,7 +31,6 @@ module Cardano.Ledger.Conway.Era (
   hardforkConwayDELEGIncorrectDepositsAndRefunds,
 ) where
 
-import Cardano.Ledger.Babbage (BabbageEra)
 import Cardano.Ledger.BaseTypes (ProtVer (pvMajor), natVersion)
 import Cardano.Ledger.Core
 import Cardano.Ledger.Internal.Era (ConwayEra)
@@ -46,13 +45,6 @@ import Cardano.Ledger.Shelley.Rules (
 
 -- =====================================================
 
-instance Era ConwayEra where
-  type PreviousEra ConwayEra = BabbageEra
-  type ProtVerLow ConwayEra = 9
-  type ProtVerHigh ConwayEra = 11
-
-  eraName = "Conway"
-
 type instance Value ConwayEra = MaryValue
 
 -------------------------------------------------------------------------------

eras/dijkstra/src/Cardano/Ledger/Dijkstra/Era.hs

@@ -11,28 +11,13 @@ module Cardano.Ledger.Dijkstra.Era (
   DijkstraCERT,
 ) where
 
-import Cardano.Ledger.Conway (ConwayEra)
-import Cardano.Ledger.Conway.Core (
-  Era (..),
-  EraRule,
-  EraRuleEvent,
-  EraRuleFailure,
-  Value,
-  VoidEraRule,
- )
+import Cardano.Ledger.Conway.Core
 import Cardano.Ledger.Conway.Rules
 import Cardano.Ledger.Internal.Era (DijkstraEra)
 import Cardano.Ledger.Mary (MaryValue)
 import qualified Cardano.Ledger.Shelley.API as API
 import Cardano.Ledger.Shelley.Rules
 
-instance Era DijkstraEra where
-  type PreviousEra DijkstraEra = ConwayEra
-  type ProtVerLow DijkstraEra = 12
-  type ProtVerHigh DijkstraEra = 12
-
-  eraName = "Dijkstra"
-
 -------------------------------------------------------------------------------
 -- Deprecated rules
 -------------------------------------------------------------------------------

eras/mary/impl/src/Cardano/Ledger/Mary/Era.hs

@@ -12,20 +12,13 @@
 
 module Cardano.Ledger.Mary.Era (MaryEra) where
 
-import Cardano.Ledger.Allegra (AllegraEra)
 import Cardano.Ledger.Allegra.Rules (AllegraUTXO, AllegraUTXOW)
 import Cardano.Ledger.Genesis (EraGenesis, NoGenesis)
 import Cardano.Ledger.Internal.Era (MaryEra)
 import Cardano.Ledger.Mary.Value (MaryValue)
 import Cardano.Ledger.Shelley.Core
 import Cardano.Ledger.Shelley.Rules
 
-instance Era MaryEra where
-  type PreviousEra MaryEra = AllegraEra
-  type ProtVerLow MaryEra = 4
-
-  eraName = "Mary"
-
 instance EraGenesis MaryEra
 
 --------------------------------------------------------------------------------

eras/shelley/impl/src/Cardano/Ledger/Shelley/Era.hs

@@ -38,15 +38,9 @@ module Cardano.Ledger.Shelley.Era (
 
 import Cardano.Ledger.BaseTypes (ProtVer (pvMajor), natVersion)
 import Cardano.Ledger.Coin (Coin)
-import Cardano.Ledger.Core (ByronEra, Era (..), EraRule, Value)
+import Cardano.Ledger.Core (EraRule, Value)
 import Cardano.Ledger.Internal.Era (ShelleyEra)
 
-instance Era ShelleyEra where
-  type PreviousEra ShelleyEra = ByronEra
-  type ProtVerLow ShelleyEra = 2
-
-  eraName = "Shelley"
-
 type instance Value ShelleyEra = Coin
 
 data ShelleyBBODY era

eras/shelley/impl/src/Cardano/Ledger/Shelley/PParams.hs

@@ -304,7 +304,7 @@ pvCanFollow (ProtVer curMajor curMinor) (ProtVer newMajor newMinor) =
 -- | Check whether `PParamsUpdate` contains a valid `ProtVer` update. When a protocol version
 -- update is not included in `PParamsUpdate` it is considered a legal update.
 hasLegalProtVerUpdate ::
-  (ProtVerAtMost era 8, EraPParams era) => PParams era -> PParamsUpdate era -> Bool
+  (AtMostEra "Babbage" era, EraPParams era) => PParams era -> PParamsUpdate era -> Bool
 hasLegalProtVerUpdate pp ppu =
   case ppu ^. ppuProtocolVersionL of
     SNothing -> True
@@ -426,31 +426,31 @@ ppTau =
     , ppUpdate = Just $ PParamUpdate 11 ppuTauL
     }
 
-ppD :: (EraPParams era, ProtVerAtMost era 6) => PParam era
+ppD :: (EraPParams era, AtMostEra "Alonzo" era) => PParam era
 ppD =
   PParam
     { ppName = "decentralization"
     , ppLens = ppDL
     , ppUpdate = Just $ PParamUpdate 12 ppuDL
     }
 
-ppExtraEntropy :: (EraPParams era, ProtVerAtMost era 6) => PParam era
+ppExtraEntropy :: (EraPParams era, AtMostEra "Alonzo" era) => PParam era
 ppExtraEntropy =
   PParam
     { ppName = "extraPraosEntropy"
     , ppLens = ppExtraEntropyL
     , ppUpdate = Just $ PParamUpdate 13 ppuExtraEntropyL
     }
 
-ppProtocolVersion :: (EraPParams era, ProtVerAtMost era 8) => PParam era
+ppProtocolVersion :: (EraPParams era, AtMostEra "Babbage" era) => PParam era
 ppProtocolVersion =
   PParam
     { ppName = "protocolVersion"
     , ppLens = ppProtocolVersionL
     , ppUpdate = Just $ PParamUpdate 14 ppuProtocolVersionL
     }
 
-ppMinUTxOValue :: (EraPParams era, ProtVerAtMost era 4) => PParam era
+ppMinUTxOValue :: (EraPParams era, AtMostEra "Mary" era) => PParam era
 ppMinUTxOValue =
   PParam
     { ppName = "minUTxOValue"
@@ -468,9 +468,9 @@ ppMinPoolCost =
 
 shelleyPParams ::
   ( EraPParams era
-  , ProtVerAtMost era 4
-  , ProtVerAtMost era 6
-  , ProtVerAtMost era 8
+  , AtMostEra "Mary" era
+  , AtMostEra "Alonzo" era
+  , AtMostEra "Babbage" era
   ) =>
   [PParam era]
 shelleyPParams =

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Deleg.hs

@@ -131,7 +131,7 @@ newtype ShelleyDelegEvent era = DelegNewEpoch EpochNo
 instance NFData (ShelleyDelegEvent era)
 
 instance
-  (EraPParams era, ShelleyEraAccounts era, ShelleyEraTxCert era, ProtVerAtMost era 8) =>
+  (EraPParams era, ShelleyEraAccounts era, ShelleyEraTxCert era, AtMostEra "Babbage" era) =>
   STS (ShelleyDELEG era)
   where
   type State (ShelleyDELEG era) = DState era
@@ -245,7 +245,7 @@ instance
       k -> invalidKey k
 
 delegationTransition ::
-  (ShelleyEraAccounts era, ShelleyEraTxCert era, EraPParams era, ProtVerAtMost era 8) =>
+  (ShelleyEraAccounts era, ShelleyEraTxCert era, EraPParams era, AtMostEra "Babbage" era) =>
   TransitionRule (ShelleyDELEG era)
 delegationTransition = do
   TRC (DelegEnv slot epochNo ptr chainAccountState pp, ds, c) <- judgmentContext
@@ -369,7 +369,7 @@ delegationTransition = do
       pure ds
 
 checkSlotNotTooLate ::
-  (ShelleyEraAccounts era, ShelleyEraTxCert era, EraPParams era, ProtVerAtMost era 8) =>
+  (ShelleyEraAccounts era, ShelleyEraTxCert era, EraPParams era, AtMostEra "Babbage" era) =>
   SlotNo ->
   EpochNo ->
   Rule (ShelleyDELEG era) 'Transition ()

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Delpl.hs

@@ -232,7 +232,7 @@ instance
   ( ShelleyEraAccounts era
   , ShelleyEraTxCert era
   , EraPParams era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   , PredicateFailure (EraRule "DELEG" era) ~ ShelleyDelegPredFailure era
   , Event (EraRule "DELEG" era) ~ ShelleyDelegEvent era
   ) =>

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ledger.hs

@@ -260,7 +260,7 @@ instance
   , Environment (EraRule "DELEGS" era) ~ DelegsEnv era
   , State (EraRule "DELEGS" era) ~ CertState era
   , Signal (EraRule "DELEGS" era) ~ Seq (TxCert era)
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   ) =>
   STS (ShelleyLEDGER era)
   where

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Newpp.hs

@@ -52,7 +52,7 @@ data NewppEnv era = NewppEnv
 instance
   ( EraGov era
   , GovState era ~ ShelleyGovState era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   ) =>
   STS (ShelleyNEWPP era)
   where
@@ -70,7 +70,7 @@ newPpTransition ::
   forall era.
   ( GovState era ~ ShelleyGovState era
   , EraGov era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   ) =>
   TransitionRule (ShelleyNEWPP era)
 newPpTransition = do
@@ -89,7 +89,7 @@ newPpTransition = do
 updatePpup ::
   ( EraPParams era
   , GovState era ~ ShelleyGovState era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   ) =>
   Word64 ->
   GovState era ->

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Ppup.hs

@@ -121,7 +121,7 @@ newtype PpupEvent era = PpupNewEpoch EpochNo
 
 instance NFData (PpupEvent era)
 
-instance (EraPParams era, ProtVerAtMost era 8) => STS (ShelleyPPUP era) where
+instance (EraPParams era, AtMostEra "Babbage" era) => STS (ShelleyPPUP era) where
   type State (ShelleyPPUP era) = ShelleyGovState era
   type Signal (ShelleyPPUP era) = StrictMaybe (Update era)
   type Environment (ShelleyPPUP era) = PpupEnv era
@@ -147,7 +147,8 @@ instance Era era => DecCBOR (ShelleyPpupPredFailure era) where
     2 -> SumD PVCannotFollowPPUP <! From
     k -> Invalid k
 
-ppupTransitionNonEmpty :: (EraPParams era, ProtVerAtMost era 8) => TransitionRule (ShelleyPPUP era)
+ppupTransitionNonEmpty ::
+  (EraPParams era, AtMostEra "Babbage" era) => TransitionRule (ShelleyPPUP era)
 ppupTransitionNonEmpty = do
   TRC
     ( PPUPEnv slot pp (GenDelegs genDelegs)

eras/shelley/impl/src/Cardano/Ledger/Shelley/Rules/Upec.hs

@@ -61,7 +61,7 @@ instance
   ( EraGov era
   , Default (PParams era)
   , GovState era ~ ShelleyGovState era
-  , ProtVerAtMost era 8
+  , AtMostEra "Babbage" era
   ) =>
   STS (ShelleyUPEC era)
   where

eras/shelley/impl/src/Cardano/Ledger/Shelley/TxBody.hs

@@ -89,7 +89,7 @@ import GHC.Generics (Generic)
 import Lens.Micro
 import NoThunks.Class (NoThunks (..))
 
-class (ShelleyEraTxCert era, EraTxBody era, ProtVerAtMost era 8) => ShelleyEraTxBody era where
+class (ShelleyEraTxCert era, EraTxBody era, AtMostEra "Babbage" era) => ShelleyEraTxBody era where
   ttlTxBodyL :: ExactEra ShelleyEra era => Lens' (TxBody era) SlotNo
 
   updateTxBodyL :: Lens' (TxBody era) (StrictMaybe (Update era))