Use era for decoding alonzo genesis

cardano-node-chairman/cardano-node-chairman.cabal

@@ -88,5 +88,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts "-with-rtsopts=-N -T"
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 9.0.0.0
+                      , cardano-cli:cardano-cli ^>= 9.0
                       , cardano-node-chairman:cardano-node-chairman

cardano-node/src/Cardano/Node/Protocol/Alonzo.hs

@@ -1,5 +1,6 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TypeApplications #-}
 
 module Cardano.Node.Protocol.Alonzo
   ( AlonzoProtocolInstantiationError(..)
@@ -9,24 +10,33 @@ module Cardano.Node.Protocol.Alonzo
   ) where
 
 import           Cardano.Api
+import           Cardano.Api.Shelley
 
 import qualified Cardano.Ledger.Alonzo.Genesis as Alonzo
 import           Cardano.Node.Orphans ()
-import           Cardano.Node.Protocol.Shelley (GenesisReadError, readGenesisAny)
+import           Cardano.Node.Protocol.Shelley (GenesisReadError (..), readGenesisAny)
 import           Cardano.Node.Types
 import           Cardano.Tracing.OrphanInstances.HardFork ()
 import           Cardano.Tracing.OrphanInstances.Shelley ()
 
+import qualified Data.ByteString.Lazy as LBS
+
 
 --
 -- Alonzo genesis
 --
 
-readGenesis :: GenesisFile
+readGenesis :: Maybe (CardanoEra era)
+            -> GenesisFile
             -> Maybe GenesisHash
             -> ExceptT GenesisReadError IO
                        (Alonzo.AlonzoGenesis, GenesisHash)
-readGenesis = readGenesisAny
+readGenesis mEra gf@(GenesisFile file) mGenesisHash = do
+  (_genesis, genesisHash) <- readGenesisAny @Alonzo.AlonzoGenesis gf mGenesisHash
+
+  content <- handleIOExceptT (GenesisReadFileError file) $ LBS.readFile file
+  genesis <- modifyError (GenesisDecodeError file) $ decodeAlonzoGenesis mEra content
+  pure (genesis, genesisHash)
 
 validateGenesis :: Alonzo.AlonzoGenesis
                 -> ExceptT AlonzoProtocolInstantiationError IO ()

cardano-node/src/Cardano/Node/Protocol/Cardano.hs

@@ -87,7 +87,7 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
                              npcConwayGenesisFile,
                              npcConwayGenesisFileHash
                            }
-                           NodeHardForkProtocolConfiguration {
+                           npc@NodeHardForkProtocolConfiguration {
                             npcExperimentalHardForksEnabled,
                             -- During testing of the Alonzo era, we conditionally declared that we
                             -- knew about the Alonzo era. We do so only when a config option for
@@ -125,8 +125,15 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration {
 
     (alonzoGenesis, _alonzoGenesisHash) <-
       firstExceptT CardanoProtocolInstantiationAlonzoGenesisReadError $
-        Alonzo.readGenesis npcAlonzoGenesisFile
-                           npcAlonzoGenesisFileHash
+        case npcTestStartingEra npc of
+          Nothing ->
+            Alonzo.readGenesis Nothing
+                               npcAlonzoGenesisFile
+                               npcAlonzoGenesisFileHash
+          Just (AnyShelleyBasedEra sbe) -> do
+            Alonzo.readGenesis (Just $ toCardanoEra sbe)
+                               npcAlonzoGenesisFile
+                               npcAlonzoGenesisFileHash
 
     (conwayGenesis, _conwayGenesisHash) <-
       firstExceptT CardanoProtocolInstantiationConwayGenesisReadError $

cardano-node/src/Cardano/Node/Protocol/Shelley.hs

@@ -292,7 +292,6 @@ instance Error GenesisReadError where
         "There was an error parsing the genesis file: "
      <> pshow fp <> " Error: " <> pshow err
 
-
 newtype GenesisValidationError = GenesisValidationErrors [Shelley.ValidationErr]
   deriving Show
 

cardano-node/src/Cardano/Node/Types.hs

@@ -4,6 +4,8 @@
 {-# LANGUAGE MonoLocalBinds #-}
 {-# LANGUAGE NamedFieldPuns #-}
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.Node.Types
   ( -- * Configuration
@@ -22,6 +24,7 @@ module Cardano.Node.Types
     -- * Consensus protocol configuration
   , NodeByronProtocolConfiguration(..)
   , NodeHardForkProtocolConfiguration(..)
+  , npcTestStartingEra
   , NodeProtocolConfiguration(..)
   , NodeShelleyProtocolConfiguration(..)
   , NodeAlonzoProtocolConfiguration(..)
@@ -40,10 +43,11 @@ import           Ouroboros.Network.NodeToNode (DiffusionMode (..))
 import           Control.Exception
 import           Data.Aeson
 import           Data.ByteString (ByteString)
-import           Data.Monoid (Last)
+import           Data.Monoid (Last (..))
 import           Data.String (IsString)
 import           Data.Text (Text)
 import qualified Data.Text as Text
+import           Data.Typeable
 import           Data.Word (Word16, Word8)
 
 -- | Errors for the cardano-config module.
@@ -283,6 +287,53 @@ data NodeHardForkProtocolConfiguration =
      }
   deriving (Eq, Show)
 
+-- | Find the starting era for the test network, if it was configured.
+--
+-- Starting eras have zero defined as a forking epoch. So here we're taking the last zeroed configuration value.
+-- Returns 'Nothing' if no @HardForkAt@ option is present, or all of them have non-zero value - meaning we are
+-- starting from the very first era: Byron.
+npcTestStartingEra :: NodeHardForkProtocolConfiguration -> Maybe AnyShelleyBasedEra
+npcTestStartingEra NodeHardForkProtocolConfiguration
+  { npcTestShelleyHardForkAtEpoch
+  , npcTestShelleyHardForkAtVersion
+  , npcTestAllegraHardForkAtEpoch
+  , npcTestAllegraHardForkAtVersion
+  , npcTestMaryHardForkAtEpoch
+  , npcTestMaryHardForkAtVersion
+  , npcTestAlonzoHardForkAtEpoch
+  , npcTestAlonzoHardForkAtVersion
+  , npcTestBabbageHardForkAtEpoch
+  , npcTestBabbageHardForkAtVersion
+  , npcTestConwayHardForkAtEpoch
+  , npcTestConwayHardForkAtVersion
+  } =
+    getLast . mconcat $
+      [ checkIfInstantFork ShelleyBasedEraShelley (EpochNo 0) npcTestShelleyHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraShelley 0 npcTestShelleyHardForkAtVersion
+      , checkIfInstantFork ShelleyBasedEraAllegra (EpochNo 0) npcTestAllegraHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraAllegra 0 npcTestAllegraHardForkAtVersion
+      , checkIfInstantFork ShelleyBasedEraMary (EpochNo 0) npcTestMaryHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraMary 0 npcTestMaryHardForkAtVersion
+      , checkIfInstantFork ShelleyBasedEraAlonzo (EpochNo 0) npcTestAlonzoHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraAlonzo 0 npcTestAlonzoHardForkAtVersion
+      , checkIfInstantFork ShelleyBasedEraBabbage (EpochNo 0) npcTestBabbageHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraBabbage 0 npcTestBabbageHardForkAtVersion
+      , checkIfInstantFork ShelleyBasedEraConway (EpochNo 0) npcTestConwayHardForkAtEpoch
+      , checkIfInstantFork ShelleyBasedEraConway 0 npcTestConwayHardForkAtVersion
+      ]
+  where
+    checkIfInstantFork :: Typeable era
+                       => Eq v
+                       => ShelleyBasedEra era
+                       -> v  -- ^ value indicating instant fork
+                       -> Maybe v -- ^ config param
+                       -> Last AnyShelleyBasedEra -- ^ Just era if instantly forking
+    checkIfInstantFork _ _ Nothing = Last Nothing
+    checkIfInstantFork sbe v (Just tv)
+      | tv == v = Last . Just $ AnyShelleyBasedEra sbe
+      | otherwise = Last Nothing
+
+
 newtype TopologyFile = TopologyFile
   { unTopology :: FilePath }
   deriving newtype (Show, Eq)

cardano-testnet/src/Testnet/Defaults.hs

@@ -86,9 +86,9 @@ newtype AlonzoGenesisError
   = AlonzoGenErrTooMuchPrecision Rational
   deriving Show
 
-defaultAlonzoGenesis :: Either AlonzoGenesisError AlonzoGenesis
-defaultAlonzoGenesis = do
-  let genesis = Api.alonzoGenesisDefaults
+defaultAlonzoGenesis :: CardanoEra era -> Either AlonzoGenesisError AlonzoGenesis
+defaultAlonzoGenesis era = do
+  let genesis = Api.alonzoGenesisDefaults era
       prices = Ledger.agPrices genesis
 
   -- double check that prices have correct values - they're set using unsafeBoundedRational in cardano-api

cardano-testnet/src/Testnet/Start/Cardano.hs

@@ -98,16 +98,18 @@ cardanoTestnetDefault
   -> Conf
   -> H.Integration TestnetRuntime
 cardanoTestnetDefault opts conf = do
-  alonzoGenesis <- H.evalEither $ first prettyError Defaults.defaultAlonzoGenesis
+  AnyCardanoEra cEra <- pure $ cardanoNodeEra cardanoDefaultTestnetOptions
+  alonzoGenesis <- getDefaultAlonzoGenesis cEra
   (startTime, shelleyGenesis) <- getDefaultShelleyGenesis opts
   cardanoTestnet opts conf startTime shelleyGenesis alonzoGenesis Defaults.defaultConwayGenesis
 
 -- | An 'AlonzoGenesis' value that is fit to pass to 'cardanoTestnet'
 getDefaultAlonzoGenesis :: ()
   => HasCallStack
   => MonadTest m
-  => m AlonzoGenesis
-getDefaultAlonzoGenesis = H.evalEither $ first prettyError Defaults.defaultAlonzoGenesis
+  => CardanoEra era
+  -> m AlonzoGenesis
+getDefaultAlonzoGenesis cEra = H.evalEither $ first prettyError (Defaults.defaultAlonzoGenesis cEra)
 
 -- | A start time and 'ShelleyGenesis' value that are fit to pass to 'cardanoTestnet'
 getDefaultShelleyGenesis :: ()

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs

@@ -69,6 +69,13 @@ hprop_transaction = integrationRetryWorkspace 0 "babbage-transaction" $ \tempAbs
   txbodyFp <- H.note $ work </> "tx.body"
   txbodySignedFp <- H.note $ work </> "tx.body.signed"
 
+  -- This fails because cardano-cli produces V2 cost model with 185 params in a list format
+  void $ execCli' execConfig
+    [ anyEraToString cEra, "query", "protocol-parameters"
+    , "--cardano-mode"
+    , "--out-file", work </> "pparams.json"
+    ]
+
   void $ execCli' execConfig
     [ anyEraToString cEra, "query", "utxo"
     , "--address", Text.unpack $ paymentKeyInfoAddr wallet0

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs

@@ -21,7 +21,6 @@ import           Cardano.Testnet
 import           Prelude
 
 import           Control.Monad
-import           Data.Bifunctor
 import qualified Data.ByteString.Char8 as BSC
 import qualified Data.Map.Strict as Map
 import           Data.Maybe.Strict
@@ -103,7 +102,7 @@ hprop_gov_no_confidence = integrationWorkspace "no-confidence" $ \tempAbsBasePat
       committeeThreshold = unsafeBoundedRational 0.5
       committee = L.Committee (Map.fromList [(comKeyCred1, EpochNo 100)]) committeeThreshold
 
-  alonzoGenesis <- evalEither $ first prettyError defaultAlonzoGenesis
+  alonzoGenesis <- getDefaultAlonzoGenesis era
   (startTime, shelleyGenesis') <- getDefaultShelleyGenesis fastTestnetOptions
   let conwayGenesisWithCommittee =
         defaultConwayGenesis { L.cgCommittee = committee }

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Node/Shutdown.hs

@@ -66,6 +66,7 @@ hprop_shutdown = integrationRetryWorkspace 2 "shutdown" $ \tempAbsBasePath' -> H
       logDir' = makeLogDir $ tempAbsPath conf
       socketDir' = makeSocketDir $ tempAbsPath conf
       testnetMagic' = 42
+      era = BabbageEra
 
   -- TODO: We need to uniformly create these directories
   H.createDirectoryIfMissing_ logDir'
@@ -101,7 +102,7 @@ hprop_shutdown = integrationRetryWorkspace 2 "shutdown" $ \tempAbsBasePath' -> H
 
   -- 2. Create Alonzo genesis
   alonzoBabbageTestGenesisJsonTargetFile <- H.noteShow $ tempAbsPath' </> shelleyDir </> "genesis.alonzo.spec.json"
-  gen <- Testnet.getDefaultAlonzoGenesis
+  gen <- Testnet.getDefaultAlonzoGenesis era
   H.evalIO $ LBS.writeFile alonzoBabbageTestGenesisJsonTargetFile $ encode gen
 
   -- 2. Create Conway genesis
@@ -130,7 +131,7 @@ hprop_shutdown = integrationRetryWorkspace 2 "shutdown" $ \tempAbsBasePath' -> H
                                  $ mconcat [ byronGenesisHash
                                            , shelleyGenesisHash
                                            , alonzoGenesisHash
-                                           , defaultYamlHardforkViaConfig (AnyCardanoEra BabbageEra)] -- TODO: This should not be hardcoded
+                                           , defaultYamlHardforkViaConfig (AnyCardanoEra era)] -- TODO: This should not be hardcoded
 
   H.evalIO $ LBS.writeFile (tempAbsPath' </> "configuration.yaml") finalYamlConfig
 

cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json

@@ -357,7 +357,17 @@
                 10,
                 38887044,
                 32947,
-                10
+                10,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807
             ],
             "PlutusV3": [
                 0,
@@ -1015,7 +1025,17 @@
                         10,
                         38887044,
                         32947,
-                        10
+                        10,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807
                     ],
                     "PlutusV3": [
                         0,
@@ -1662,7 +1682,17 @@
                         10,
                         38887044,
                         32947,
-                        10
+                        10,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807,
+                        9223372036854775807
                     ],
                     "PlutusV3": [
                         0,
@@ -2306,7 +2336,17 @@
                 10,
                 38887044,
                 32947,
-                10
+                10,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807,
+                9223372036854775807
             ],
             "PlutusV3": [
                 0,

cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json

@@ -346,7 +346,17 @@
             10,
             38887044,
             32947,
-            10
+            10,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807
         ],
         "PlutusV3": [
             0,

cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt

@@ -346,7 +346,17 @@
             10,
             38887044,
             32947,
-            10
+            10,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807,
+            9223372036854775807
         ],
         "PlutusV3": [
             0,