WIP

IntersectMBO · Sep 25, 2024 · 5181d0a · 5181d0a
1 parent f6296b2
commit 5181d0a
Show file tree

Hide file tree

Showing 4 changed files with 191 additions and 182 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -401,6 +401,7 @@ test-suite cardano-cli-golden
     cborg,
     containers,
     directory,
+    exceptions,
     extra,
     filepath,
     hedgehog ^>=1.4,

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis/CreateTestnetData.hs
@@ -39,6 +39,7 @@ import qualified Cardano.CLI.EraBased.Commands.Governance.DRep as DRep
 import qualified Cardano.CLI.EraBased.Commands.Node as Cmd
 import           Cardano.CLI.EraBased.Run.Address (generateAndWriteKeyFiles)
 import           Cardano.CLI.EraBased.Run.Genesis.Common
+import qualified Cardano.CLI.EraBased.Run.Genesis.NodeConfiguration as NodeConfiguration
 import qualified Cardano.CLI.EraBased.Run.Governance.DRep as DRep
 import qualified Cardano.CLI.EraBased.Run.Key as Key
 import           Cardano.CLI.EraBased.Run.Node (runNodeIssueOpCertCmd, runNodeKeyGenColdCmd,
@@ -337,39 +338,51 @@ runGenesisCreateTestNetDataCmd
     liftIO $ LBS.writeFile shelleyGenesisPath $ Aeson.encode shelleyGenesis'
     liftIO $ LBS.writeFile alonzoGenesisPath $ Aeson.encode alonzoGenesis
 
-    case specNodeConfig of
-      Nothing -> {- TODO create fresh node config -} pure ()
-      Just inputNodeConfigPath -> do
-        let tmpOutputNodeConfigPath = outputDir </> "config.tmp.json"
-            tmpOutputNodeConfigPath2 = outputDir </> "config.tmp.2.json"
-            outputNodeConfigPath = outputDir </> "config.json"
-        -- Write hashes
-        conwayGenesisHash <- getShelleyOnwardsGenesisHash conwayGenesisPath
-        shelleyGenesisHash <- getShelleyOnwardsGenesisHash shelleyGenesisPath
-        alonzoGenesisHash <- getShelleyOnwardsGenesisHash alonzoGenesisPath
-        liftIO $ copyFile inputNodeConfigPath tmpOutputNodeConfigPath
-        liftIO $
-          writeGenesisHashesToNodeConfigFile
-            tmpOutputNodeConfigPath
-            ( Map.fromList
-                [ ("ConwayGenesisHash", conwayGenesisHash)
-                , ("ShelleyGenesisHash", shelleyGenesisHash)
-                , ("AlonzoGenesisHash", alonzoGenesisHash)
-                ]
-            )
-            tmpOutputNodeConfigPath2
-        -- Write filepaths
-        liftIO $
-          writeGenesisPathsToNodeConfigFile
-            tmpOutputNodeConfigPath2
-            ( Map.fromList
-                [ ("ConwayGenesisFile", Text.pack $ conwayGenesisFilename)
-                , ("ShelleyGenesisFile", Text.pack $ shelleyGenesisFilename)
-                , ("AlonzoGenesisFile", Text.pack $ alonzoGenesisFilename)
-                ]
-            )
-            outputNodeConfigPath
-        liftIO $ forM_ [tmpOutputNodeConfigPath, tmpOutputNodeConfigPath2] removeFile
+    (inputNodeConfigPath, rmInputNodeConfigPath) <-
+      case specNodeConfig of
+        Nothing -> do
+          -- Use a default template, delete it afterwards
+          let result = outputDir </> "config.template.json"
+          liftIO $ LBS.writeFile result $ Aeson.encode $ NodeConfiguration.defaultHardforkViaConfig eon
+          return (result, True)
+        Just x ->
+          -- Use the template used as input, don't delete it afterwards
+          pure (x, False)
+
+    let tmpOutputNodeConfigPath = outputDir </> "config.tmp.json"
+        tmpOutputNodeConfigPath2 = outputDir </> "config.tmp.2.json"
+        outputNodeConfigPath = outputDir </> "config.json"
+    -- Write hashes
+    conwayGenesisHash <- getShelleyOnwardsGenesisHash conwayGenesisPath
+    shelleyGenesisHash <- getShelleyOnwardsGenesisHash shelleyGenesisPath
+    alonzoGenesisHash <- getShelleyOnwardsGenesisHash alonzoGenesisPath
+    liftIO $ copyFile inputNodeConfigPath tmpOutputNodeConfigPath
+    liftIO $
+      writeGenesisHashesToNodeConfigFile
+        tmpOutputNodeConfigPath
+        ( Map.fromList
+            [ ("ConwayGenesisHash", conwayGenesisHash)
+            , ("ShelleyGenesisHash", shelleyGenesisHash)
+            , ("AlonzoGenesisHash", alonzoGenesisHash)
+            ]
+        )
+        tmpOutputNodeConfigPath2
+    -- Write filepaths
+    liftIO $
+      writeGenesisPathsToNodeConfigFile
+        tmpOutputNodeConfigPath2
+        ( Map.fromList
+            [ ("ConwayGenesisFile", Text.pack $ conwayGenesisFilename)
+            , ("ShelleyGenesisFile", Text.pack $ shelleyGenesisFilename)
+            , ("AlonzoGenesisFile", Text.pack $ alonzoGenesisFilename)
+            ]
+        )
+        outputNodeConfigPath
+    -- Cleanup
+    liftIO $
+      forM_
+        ([tmpOutputNodeConfigPath, tmpOutputNodeConfigPath2] ++ [inputNodeConfigPath | rmInputNodeConfigPath])
+        removeFile
    where
     genesisDir = outputDir </> "genesis-keys"
     delegateDir = outputDir </> "delegate-keys"