Add dijkstra genesis support in create-testnet-data

Author: carbolymer

cardano-cli/cardano-cli.cabal

@@ -251,6 +251,7 @@ library
     cardano-ledger-api,
     cardano-ledger-conway,
     cardano-ledger-core,
+    cardano-ledger-dijkstra,
     cardano-ping ^>=0.9,
     cardano-prelude,
     cardano-protocol-tpraos,

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Command.hs

@@ -105,6 +105,8 @@ data GenesisCreateTestNetDataCmdArgs = forall era. GenesisCreateTestNetDataCmdAr
   -- ^ Path to the @genesis-alonzo@ file to use. If unspecified, a default one will be used.
   , specConway :: !(Maybe FilePath)
   -- ^ Path to the @genesis-conway@ file to use. If unspecified, a default one will be used.
+  , specDijkstra :: !(Maybe FilePath)
+  -- ^ Path to the @genesis-dijkstra@ file to use. If unspecified, a default one will be used.
   , numGenesisKeys :: !Word
   -- ^ The number of genesis keys credentials to create and write to disk.
   , numPools :: !Word

cardano-cli/src/Cardano/CLI/EraBased/Genesis/CreateTestnetData/Run.hs

@@ -56,7 +56,6 @@ import Cardano.CLI.Type.Error.NodeCmdError
 import Cardano.CLI.Type.Error.StakePoolCmdError
 import Cardano.CLI.Type.Key
 import Cardano.Crypto.Hash qualified as Crypto
-import Cardano.Ledger.Compactible qualified as L
 import Cardano.Prelude (canonicalEncodePretty)
 import Cardano.Protocol.Crypto qualified as C
 
@@ -222,6 +221,7 @@ runGenesisCreateTestNetDataCmd
     , specShelley
     , specAlonzo
     , specConway
+    , specDijkstra
     , numGenesisKeys
     , numPools
     , stakeDelegators =
@@ -252,6 +252,9 @@ runGenesisCreateTestNetDataCmd
         <$> traverse (fromExceptTCli . decodeAlonzoGenesisFile) specAlonzo
     conwayGenesis <-
       fromMaybe conwayGenesisDefaults <$> fromExceptTCli (traverse decodeConwayGenesisFile specConway)
+    dijkstraGenesis <-
+      fromMaybe dijkstraGenesisDefaults
+        <$> fromExceptTCli (traverse decodeDijkstraGenesisFile specDijkstra)
 
     -- Read NetworkId either from file or from the flag. Flag overrides template file.
     let actualNetworkId =
@@ -427,9 +430,10 @@ runGenesisCreateTestNetDataCmd
     -- 2. Users of cardano-testnet may use them
 
     forM_
-      [ ("conway-genesis.json", WritePretty conwayGenesis')
-      , ("shelley-genesis.json", WritePretty shelleyGenesis')
+      [ ("shelley-genesis.json", WritePretty shelleyGenesis')
       , ("alonzo-genesis.json", WritePretty alonzoGenesis)
+      , ("conway-genesis.json", WritePretty conwayGenesis')
+      , ("dijkstra-genesis.json", WritePretty dijkstraGenesis)
       ]
       $ \(filename, genesis) -> fromExceptTCli $ writeFileGenesis (outputDir </> filename) genesis
    where

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Internal/Common.hs

@@ -12,6 +12,7 @@ module Cardano.CLI.EraBased.Genesis.Internal.Common
   ( decodeShelleyGenesisFile
   , decodeAlonzoGenesisFile
   , decodeConwayGenesisFile
+  , decodeDijkstraGenesisFile
   , genStuffedAddress
   , getCurrentTimePlus30
   , readRelays
@@ -33,6 +34,7 @@ import Cardano.CLI.Type.Error.ProtocolParamsError
 import Cardano.Crypto.Hash (HashAlgorithm)
 import Cardano.Crypto.Hash qualified as Hash
 import Cardano.Crypto.Random qualified as Crypto
+import Cardano.Ledger.Dijkstra.Genesis (DijkstraGenesis (..))
 
 import Data.Aeson qualified as A
 import Data.Binary.Get qualified as Bin
@@ -66,6 +68,12 @@ decodeConwayGenesisFile
   -> t m ConwayGenesis
 decodeConwayGenesisFile = readAndDecodeGenesisFileWith A.eitherDecode
 
+decodeDijkstraGenesisFile
+  :: MonadIOTransError GenesisCmdError t m
+  => FilePath
+  -> t m DijkstraGenesis
+decodeDijkstraGenesisFile = readAndDecodeGenesisFileWith A.eitherDecode
+
 readAndDecodeGenesisFileWith
   :: forall t m a
    . Typeable a

cardano-cli/src/Cardano/CLI/EraBased/Genesis/Option.hs

@@ -231,6 +231,7 @@ pGenesisCreateTestNetData envCli =
       <$> optional (pSpecFile "shelley")
       <*> optional (pSpecFile "alonzo")
       <*> optional (pSpecFile "conway")
+      <*> optional (pSpecFile "dijkstra")
       <*> pNumGenesisKeys
       <*> pNumPools
       <*> pNumStakeDelegs

cardano-cli/src/Cardano/CLI/EraBased/Transaction/Run.hs

@@ -40,7 +40,6 @@ import Cardano.Api.Byron qualified as Byron
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Ledger qualified as L
-import Cardano.Ledger.Compactible qualified as L
 import Cardano.Api.Network qualified as Consensus
 import Cardano.Api.Network qualified as Net.Tx
 

cardano-cli/src/Cardano/CLI/Type/Common.hs

@@ -106,7 +106,6 @@ import Cardano.Api hiding (Script)
 import Cardano.Api.Ledger qualified as L
 
 import Cardano.Ledger.Api.State.Query qualified as L
-import Cardano.Ledger.Compactible qualified as L
 import Cardano.Ledger.State qualified as L
 
 import Data.Aeson (object, pairs, (.=))

cardano-cli/test/cardano-cli-golden/files/golden/conway/create-testnet-data.out

@@ -50,6 +50,7 @@ delegate-keys/delegate2/opcert.cert
 delegate-keys/delegate2/opcert.counter
 delegate-keys/delegate2/vrf.skey
 delegate-keys/delegate2/vrf.vkey
+dijkstra-genesis.json
 drep-keys/README.md
 drep-keys/drep1/drep.skey
 drep-keys/drep1/drep.vkey

cardano-cli/test/cardano-cli-golden/files/golden/help.cli

@@ -1232,6 +1232,7 @@ Usage: cardano-cli conway genesis create-staked
 Usage: cardano-cli conway genesis create-testnet-data [--spec-shelley FILEPATH]
                                                         [--spec-alonzo FILEPATH]
                                                         [--spec-conway FILEPATH]
+                                                        [--spec-dijkstra FILEPATH]
                                                         [--genesis-keys INT]
                                                         [--pools INT]
                                                         [ --stake-delegators INT
@@ -3529,6 +3530,7 @@ Usage: cardano-cli latest genesis create-staked
 Usage: cardano-cli latest genesis create-testnet-data [--spec-shelley FILEPATH]
                                                         [--spec-alonzo FILEPATH]
                                                         [--spec-conway FILEPATH]
+                                                        [--spec-dijkstra FILEPATH]
                                                         [--genesis-keys INT]
                                                         [--pools INT]
                                                         [ --stake-delegators INT

cardano-cli/test/cardano-cli-golden/files/golden/help/conway_genesis_create-testnet-data.cli

@@ -1,6 +1,7 @@
 Usage: cardano-cli conway genesis create-testnet-data [--spec-shelley FILEPATH]
                                                         [--spec-alonzo FILEPATH]
                                                         [--spec-conway FILEPATH]
+                                                        [--spec-dijkstra FILEPATH]
                                                         [--genesis-keys INT]
                                                         [--pools INT]
                                                         [ --stake-delegators INT
@@ -28,6 +29,8 @@ Available options:
                            default one is generated if omitted.
   --spec-conway FILEPATH   The conway specification file to use as input. A
                            default one is generated if omitted.
+  --spec-dijkstra FILEPATH The dijkstra specification file to use as input. A
+                           default one is generated if omitted.
   --genesis-keys INT       The number of genesis keys to make (default is 3).
   --pools INT              The number of stake pool credential sets to make
                            (default is 0).