Merge #3971

3971: Integrate the Conway era r=dnadales a=nfrisby

Fixes #3962. Integrates the Conway era.



Co-authored-by: Nicolas Frisby <nick.frisby@iohk.io>

ouroboros-consensus-cardano-test/ouroboros-consensus-cardano-test.cabal

@@ -48,6 +48,7 @@ library
                      , cardano-ledger-alonzo-test
                      , cardano-ledger-babbage
                      , cardano-ledger-babbage-test
+                     , cardano-ledger-conway-test
                      , cardano-ledger-byron
                      , cardano-ledger-core
                      , cardano-ledger-shelley
@@ -105,6 +106,7 @@ test-suite test
 
                      , cardano-ledger-alonzo
                      , cardano-ledger-byron
+                     , cardano-ledger-conway
                      , cardano-ledger-core
                      , cardano-ledger-shelley
                      , cardano-protocol-tpraos

ouroboros-consensus-cardano-test/src/Test/Consensus/Cardano/Examples.hs

@@ -71,6 +71,7 @@ eraExamples =
     :* Shelley.examplesMary
     :* Shelley.examplesAlonzo
     :* Shelley.examplesBabbage
+    :* Shelley.examplesConway
     :* Nil
 
 -- | By using this function, we can't forget to update this test when adding a
@@ -89,6 +90,7 @@ combineEras = mconcat . hcollapse . hap eraInjections
         :* fn (K . injExamples "Mary"    (IS (IS (IS IZ))))
         :* fn (K . injExamples "Alonzo"  (IS (IS (IS (IS IZ)))))
         :* fn (K . injExamples "Babbage" (IS (IS (IS (IS (IS IZ))))))
+        :* fn (K . injExamples "Conway"  (IS (IS (IS (IS (IS (IS IZ)))))))
         :* Nil
 
     injExamples ::
@@ -163,6 +165,9 @@ alonzoEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis
 babbageEraParams :: History.EraParams
 babbageEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis
 
+conwayEraParams :: History.EraParams
+conwayEraParams = Shelley.shelleyEraParams Shelley.testShelleyGenesis
+
 -- | We use 10, 20, 30, 40, ... as the transition epochs
 shelleyTransitionEpoch :: EpochNo
 shelleyTransitionEpoch = 10
@@ -205,6 +210,13 @@ babbageStartBound =
       alonzoStartBound
       50
 
+conwayStartBound :: History.Bound
+conwayStartBound =
+    History.mkUpperBound
+      alonzoEraParams
+      alonzoStartBound
+      60
+
 exampleStartBounds :: Exactly (CardanoEras Crypto) History.Bound
 exampleStartBounds = Exactly $
     (  K byronStartBound
@@ -213,6 +225,7 @@ exampleStartBounds = Exactly $
     :* K maryStartBound
     :* K alonzoStartBound
     :* K babbageStartBound
+    :* K conwayStartBound
     :* Nil
     )
 
@@ -224,6 +237,7 @@ cardanoShape = History.Shape $ Exactly $
     :* K maryEraParams
     :* K alonzoEraParams
     :* K babbageEraParams
+    :* K conwayEraParams
     :* Nil
     )
 
@@ -251,6 +265,7 @@ codecConfig =
       Shelley.ShelleyCodecConfig
       Shelley.ShelleyCodecConfig
       Shelley.ShelleyCodecConfig
+      Shelley.ShelleyCodecConfig
 
 ledgerStateByron ::
      LedgerState ByronBlock

ouroboros-consensus-cardano-test/src/Test/ThreadNet/Infra/ShelleyBasedHardFork.hs

@@ -136,7 +136,9 @@ type ShelleyBasedHardForkConstraints proto1 era1 proto2 era2 =
   , SL.TranslationError   era2 SL.NewEpochState  ~ Void
   , SL.TranslationError   era2 SL.ShelleyGenesis ~ Void
 
-  , SL.TranslationContext era1 ~ ()
+  , SL.AdditionalGenesisConfig era1 ~ ()
+  , SL.TranslationContext      era1 ~ ()
+  , SL.AdditionalGenesisConfig era2 ~ SL.TranslationContext era2
     -- At the moment, fix the protocols together
   , EraCrypto era1 ~ EraCrypto era2
   , PraosCrypto (EraCrypto era1)
@@ -265,7 +267,7 @@ protocolInfoShelleyBasedHardFork protocolParamsShelleyBased
     protocolInfo1 =
         protocolInfoTPraosShelleyBased
           protocolParamsShelleyBased
-          ()  -- trivial translation context
+          ((), ())  -- trivial additional Genesis config and translation context
           protVer1
           (TxLimits.mkOverrides TxLimits.noOverridesMeasure)
 
@@ -298,7 +300,7 @@ protocolInfoShelleyBasedHardFork protocolParamsShelleyBased
             , shelleyBasedInitialNonce
             , shelleyBasedLeaderCredentials
             }
-          transCtxt2
+          (transCtxt2, transCtxt2)
           protVer2
           (TxLimits.mkOverrides TxLimits.noOverridesMeasure)
 

ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/ByronCompatibility.hs

@@ -132,6 +132,7 @@ toCardanoCodecConfig codecConfigByron =
       ShelleyCodecConfig
       ShelleyCodecConfig
       ShelleyCodecConfig
+      ShelleyCodecConfig
 
 {------------------------------------------------------------------------------
   Byron to Cardano

ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Golden.hs

@@ -34,6 +34,7 @@ instance CardanoHardForkConstraints c
     CardanoNodeToNodeVersion4 -> "CardanoNodeToNodeVersion4"
     CardanoNodeToNodeVersion5 -> "CardanoNodeToNodeVersion5"
     CardanoNodeToNodeVersion6 -> "CardanoNodeToNodeVersion6"
+    CardanoNodeToNodeVersion7 -> "CardanoNodeToNodeVersion7"
     _                         -> error $ "Unknown version: " <> show v
 
 instance CardanoHardForkConstraints c
@@ -49,4 +50,5 @@ instance CardanoHardForkConstraints c
     CardanoNodeToClientVersion8  -> "CardanoNodeToClientVersion8"
     CardanoNodeToClientVersion9  -> "CardanoNodeToClientVersion9"
     CardanoNodeToClientVersion10 -> "CardanoNodeToClientVersion10"
+    CardanoNodeToClientVersion11 -> "CardanoNodeToClientVersion11"
     _                            -> error $ "Unknown version: " <> show blockVersion

ouroboros-consensus-cardano-test/test/Test/Consensus/Cardano/Serialisation.hs

@@ -49,19 +49,21 @@ testCodecCfg =
     ShelleyCodecConfig
     ShelleyCodecConfig
     ShelleyCodecConfig
+    ShelleyCodecConfig
 
 dictNestedHdr
   :: forall a.
      NestedCtxt_ (CardanoBlock MockCryptoCompatByron) Header a
   -> Dict (Eq a, Show a)
 dictNestedHdr = \case
-    NCZ (CtxtByronBoundary {})                    -> Dict
-    NCZ (CtxtByronRegular  {})                    -> Dict
-    NCS (NCZ CtxtShelley)                         -> Dict
-    NCS (NCS (NCZ CtxtShelley))                   -> Dict
-    NCS (NCS (NCS (NCZ CtxtShelley)))             -> Dict
-    NCS (NCS (NCS (NCS (NCZ CtxtShelley))))       -> Dict
-    NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley))))) -> Dict
+    NCZ (CtxtByronBoundary {})                          -> Dict
+    NCZ (CtxtByronRegular  {})                          -> Dict
+    NCS (NCZ CtxtShelley)                               -> Dict
+    NCS (NCS (NCZ CtxtShelley))                         -> Dict
+    NCS (NCS (NCS (NCZ CtxtShelley)))                   -> Dict
+    NCS (NCS (NCS (NCS (NCZ CtxtShelley))))             -> Dict
+    NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley)))))       -> Dict
+    NCS (NCS (NCS (NCS (NCS (NCS (NCZ CtxtShelley)))))) -> Dict
 
 {-------------------------------------------------------------------------------
   BinaryBlockInfo

ouroboros-consensus-cardano-test/test/Test/ThreadNet/Cardano.hs

@@ -47,6 +47,7 @@ import           Ouroboros.Consensus.Byron.Ledger.Conversions
 import           Ouroboros.Consensus.Byron.Node
 
 import qualified Cardano.Ledger.BaseTypes as SL (ActiveSlotCoeff)
+import qualified Cardano.Ledger.Conway.Genesis as SL
 import qualified Cardano.Ledger.Shelley.API as SL
 
 import           Ouroboros.Consensus.Shelley.Ledger.SupportsProtocol ()
@@ -77,7 +78,7 @@ import           Test.Util.TestEnv
 
 import           Ouroboros.Consensus.Protocol.Praos.Translate ()
 import           Ouroboros.Consensus.Shelley.Node.Praos
-                     (ProtocolParamsBabbage (..))
+                     (ProtocolParamsBabbage (..), ProtocolParamsConway (..))
 import           Test.ThreadNet.Infra.TwoEras
 
 -- | Use 'MockCryptoCompatByron' so that bootstrap addresses and
@@ -525,8 +526,12 @@ mkProtocolCardanoAndHardForkTxs
           , alonzoMaxTxCapacityOverrides  = TxLimits.mkOverrides TxLimits.noOverridesMeasure
           }
         ProtocolParamsBabbage {
-            babbageProtVer                = SL.ProtVer babbageMajorVersion  0
-          , babbageMaxTxCapacityOverrides  = TxLimits.mkOverrides TxLimits.noOverridesMeasure
+            babbageProtVer                = SL.ProtVer babbageMajorVersion 0
+          , babbageMaxTxCapacityOverrides = TxLimits.mkOverrides TxLimits.noOverridesMeasure
+          }
+        ProtocolParamsConway {
+            conwayProtVer                 = SL.ProtVer conwayMajorVersion  0
+          , conwayMaxTxCapacityOverrides  = TxLimits.mkOverrides TxLimits.noOverridesMeasure
           }
         protocolParamsByronShelley
         ProtocolTransitionParamsShelleyBased {
@@ -549,6 +554,14 @@ mkProtocolCardanoAndHardForkTxs
           , transitionTrigger            =
               TriggerHardForkAtVersion babbageMajorVersion
           }
+        ProtocolTransitionParamsShelleyBased {
+            transitionTranslationContext =
+              -- Note that this is effectively a no-op, which is fine for
+              -- testing, at least for now.
+              SL.ConwayGenesis $ SL.GenDelegs $ sgGenDelegs genesisShelley
+          , transitionTrigger            =
+              TriggerHardForkAtVersion conwayMajorVersion
+          }
 
     -- Byron
 
@@ -604,11 +617,16 @@ maryMajorVersion = allegraMajorVersion + 1
 alonzoMajorVersion :: Num a => a
 alonzoMajorVersion = maryMajorVersion + 1
 
--- | The major protocol version of babbage in this test
+-- | The major protocol version of Babbage in this test
 --
 babbageMajorVersion :: Num a => a
 babbageMajorVersion = alonzoMajorVersion + 1
 
+-- | The major protocol version of Conway in this test
+--
+conwayMajorVersion :: Num a => a
+conwayMajorVersion = babbageMajorVersion + 1
+
 -- | The initial minor protocol version of Byron in this test
 --
 -- See 'byronMajorVersion'