Added Dijkstra era

Author: Soupstraw

.github/workflows/haskell.yml

@@ -202,6 +202,7 @@ jobs:
         - cardano-ledger-conway
         - cardano-ledger-conway-test
         - cardano-ledger-core
+        - cardano-ledger-dijkstra
         - cardano-ledger-mary
         - cardano-ledger-shelley
         - cardano-ledger-shelley-ma-test

CONTRIBUTING.md

@@ -345,6 +345,35 @@ To change the local build directory, redo step 3 _without leaving_ the `nix deve
     ```
     in the `cabal.project` file.
 
+### Adding a new era to `cardano-ledger`
+
+First you need to crate a new sub-package in the `eras` directory.
+It's easiest to just copy the `.cabal` file from the previous era and then make
+some changes to that. Change the name of the project to `cardano-ledger-<era>`
+and update the description/synopsis.
+
+Next you'll want to add a datatype to represent the new era (e.g. `ConwayEra`). 
+Then copy over the entire test suite from the previous era and substitute the 
+era types for the newly added era type. Once the tests are in place, the type 
+checker will guide you to add all the necessary type family and type class 
+instances.
+
+Add the `Cardano.Ledger.<era>.Core` module and re-export the `Core` module from 
+the previous era. Use the `Core` module from the current era whenever you need 
+to import anything from the core module. Do the same for 
+`Cardano.Ledger.<era>.State`.
+
+It's a good idea to re-use the data types defined in the previous era at first. 
+You might need to use `coerce` in a couple of places to change the era parameter 
+when translating these types. Also, there might be some constraints that expect 
+the era to be exactly the previous era, you will probably be able to generalize
+these functions and type class instances to make them compatible with the new era.
+
+For `EraRule` instances use the same rules as in the previous era.
+
+Make sure to update `.github/ci/haskell.yml` so that the job also runs the test 
+suite of the newly added era.
+
 ### Additional documentation
 
 You can find additional documentation on the nix infrastructure used in this

cabal.project

@@ -38,6 +38,7 @@ packages:
   eras/babbage/test-suite
   eras/conway/impl
   eras/conway/test-suite
+  eras/dijkstra
   eras/mary/impl
   eras/shelley/impl
   eras/shelley/test-suite

eras/conway/impl/cardano-ledger-conway.cabal

@@ -126,11 +126,18 @@ library testlib
     Test.Cardano.Ledger.Conway.Arbitrary
     Test.Cardano.Ledger.Conway.Binary.Annotator
     Test.Cardano.Ledger.Conway.Binary.Cddl
+    Test.Cardano.Ledger.Conway.Binary.CddlSpec
     Test.Cardano.Ledger.Conway.Binary.Regression
     Test.Cardano.Ledger.Conway.Binary.RoundTrip
+    Test.Cardano.Ledger.Conway.BinarySpec
     Test.Cardano.Ledger.Conway.CDDL
+    Test.Cardano.Ledger.Conway.CommitteeRatifySpec
+    Test.Cardano.Ledger.Conway.DRepRatifySpec
     Test.Cardano.Ledger.Conway.Era
     Test.Cardano.Ledger.Conway.Genesis
+    Test.Cardano.Ledger.Conway.GenesisSpec
+    Test.Cardano.Ledger.Conway.GoldenSpec
+    Test.Cardano.Ledger.Conway.GovActionReorderSpec
     Test.Cardano.Ledger.Conway.Imp
     Test.Cardano.Ledger.Conway.Imp.BbodySpec
     Test.Cardano.Ledger.Conway.Imp.CertsSpec
@@ -144,9 +151,12 @@ library testlib
     Test.Cardano.Ledger.Conway.Imp.UtxoSpec
     Test.Cardano.Ledger.Conway.Imp.UtxosSpec
     Test.Cardano.Ledger.Conway.ImpTest
+    Test.Cardano.Ledger.Conway.Plutus.PlutusSpec
     Test.Cardano.Ledger.Conway.Proposals
+    Test.Cardano.Ledger.Conway.SPORatifySpec
     Test.Cardano.Ledger.Conway.Translation.TranslatableGen
     Test.Cardano.Ledger.Conway.TreeDiff
+    Test.Cardano.Ledger.Conway.TxInfoSpec
 
   visibility: public
   hs-source-dirs: testlib
@@ -163,6 +173,7 @@ library testlib
 
   build-depends:
     FailT,
+    aeson,
     base,
     bytestring,
     cardano-data:{cardano-data, testlib},
@@ -173,6 +184,7 @@ library testlib
     cardano-ledger-conway,
     cardano-ledger-core:{cardano-ledger-core, testlib},
     cardano-ledger-shelley:{cardano-ledger-shelley, testlib},
+    cardano-slotting:testlib,
     cardano-strict-containers,
     containers,
     cuddle >=0.3.2,
@@ -236,18 +248,8 @@ test-suite tests
   hs-source-dirs: test
   other-modules:
     Paths_cardano_ledger_conway
-    Test.Cardano.Ledger.Conway.Binary.CddlSpec
-    Test.Cardano.Ledger.Conway.BinarySpec
-    Test.Cardano.Ledger.Conway.CommitteeRatifySpec
-    Test.Cardano.Ledger.Conway.DRepRatifySpec
-    Test.Cardano.Ledger.Conway.GenesisSpec
-    Test.Cardano.Ledger.Conway.GoldenSpec
     Test.Cardano.Ledger.Conway.GoldenTranslation
-    Test.Cardano.Ledger.Conway.GovActionReorderSpec
-    Test.Cardano.Ledger.Conway.Plutus.PlutusSpec
-    Test.Cardano.Ledger.Conway.SPORatifySpec
     Test.Cardano.Ledger.Conway.Spec
-    Test.Cardano.Ledger.Conway.TxInfoSpec
 
   default-language: Haskell2010
   ghc-options:
@@ -264,22 +266,9 @@ test-suite tests
 
   build-depends:
     HUnit,
-    aeson,
     base,
-    cardano-data,
-    cardano-ledger-allegra,
-    cardano-ledger-alonzo,
     cardano-ledger-alonzo:testlib,
-    cardano-ledger-babbage,
-    cardano-ledger-binary:{cardano-ledger-binary, testlib},
     cardano-ledger-conway,
     cardano-ledger-core,
     cardano-ledger-core:testlib,
-    cardano-ledger-shelley,
-    cardano-slotting:testlib,
-    cardano-strict-containers,
-    containers,
-    data-default,
-    microlens,
-    plutus-ledger-api,
     testlib,

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

@@ -398,7 +398,7 @@ toConwayGovPairs cg@(ConwayGovState _ _ _ _ _ _ _) =
       , "futurePParams" .= cgsFuturePParams
       ]
 
-instance EraPParams ConwayEra => EraGov ConwayEra where
+instance EraGov ConwayEra where
   type GovState ConwayEra = ConwayGovState ConwayEra
 
   curPParamsGovStateL = cgsCurPParamsL

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

@@ -81,6 +81,11 @@ module Cardano.Ledger.Conway.PParams (
   conwayModifiedPPGroups,
   pvtHardForkInitiationL,
   pvtMotionNoConfidenceL,
+  conwayApplyPPUpdates,
+  emptyConwayPParams,
+  emptyConwayPParamsUpdate,
+  asNaturalHKD,
+  asBoundedIntegralHKD,
 ) where
 
 import Cardano.Ledger.Alonzo.PParams

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Bbody.hs

@@ -19,6 +19,8 @@ module Cardano.Ledger.Conway.Rules.Bbody (
   ConwayBBODY,
   ConwayBbodyPredFailure (..),
   maxRefScriptSizePerBlock,
+  alonzoToConwayBbodyPredFailure,
+  shelleyToConwayBbodyPredFailure,
 ) where
 
 import Cardano.Ledger.Allegra.Rules (AllegraUtxoPredFailure)

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Ratify.hs

@@ -13,6 +13,7 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Cardano.Ledger.Conway.Rules.Ratify (
+  ConwayRATIFY,
   RatifyState (..),
   committeeAccepted,
   committeeAcceptedRatio,

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Utxo.hs

@@ -15,6 +15,7 @@
 {-# OPTIONS_GHC -Wno-orphans #-}
 
 module Cardano.Ledger.Conway.Rules.Utxo (
+  ConwayUTXO,
   allegraToConwayUtxoPredFailure,
   babbageToConwayUtxoPredFailure,
   alonzoToConwayUtxoPredFailure,

eras/conway/impl/src/Cardano/Ledger/Conway/Rules/Utxos.hs

@@ -19,6 +19,8 @@ module Cardano.Ledger.Conway.Rules.Utxos (
   ConwayUTXOS,
   ConwayUtxosPredFailure (..),
   ConwayUtxosEvent (..),
+  alonzoToConwayUtxosPredFailure,
+  alonzoToConwayUtxosEvent,
 ) where
 
 import Cardano.Ledger.Alonzo.Plutus.Context (ContextError, EraPlutusContext)