more fix

IntersectMBO · Jul 15, 2024 · 470c77e · 470c77e
1 parent 25fc2ff
commit 470c77e
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 21 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Commands/Genesis.hs
@@ -27,7 +27,7 @@ import           Data.Text (Text)
 
 data GenesisCmds era
   = GenesisCreate !(GenesisCreateCmdArgs era)
-  | GenesisCreateCardano !GenesisCreateCardanoCmdArgs
+  | GenesisCreateCardano !(GenesisCreateCardanoCmdArgs era)
   | GenesisCreateStaked !(GenesisCreateStakedCmdArgs era)
   | GenesisCreateTestNetData !(GenesisCreateTestNetDataCmdArgs era)
   | GenesisKeyGenGenesis !GenesisKeyGenGenesisCmdArgs
@@ -51,8 +51,9 @@ data GenesisCreateCmdArgs era = GenesisCreateCmdArgs
   , network :: !NetworkId
   } deriving Show
 
-data GenesisCreateCardanoCmdArgs = GenesisCreateCardanoCmdArgs
-  { genesisDir :: !GenesisDir
+data GenesisCreateCardanoCmdArgs era = GenesisCreateCardanoCmdArgs
+  { eon :: !(ShelleyBasedEra era)
+  , genesisDir :: !GenesisDir
   , numGenesisKeys :: !Word
   , numUTxOKeys :: !Word
   , mSystemStart :: !(Maybe SystemStart)

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
@@ -62,31 +62,31 @@ pGenesisCmds era envCli =
         $ subParser "initial-txin"
         $ Opt.info (pGenesisTxIn envCli)
         $ Opt.progDesc "Get the TxIn for an initial UTxO based on the verification key"
-    , Just
-        $ subParser "create-cardano"
-        $ Opt.info (pGenesisCreateCardano envCli)
+    , forEraInEonMaybe era $ \sbe ->
+        subParser "create-cardano"
+        $ Opt.info (pGenesisCreateCardano sbe envCli)
         $ Opt.progDesc
         $ mconcat
             [ "Create a Byron and Shelley genesis file from a genesis "
             , "template and genesis/delegation/spending keys."
             ]
-    , forEraInEonMaybe era $ \sbe -> do
+    , forEraInEonMaybe era $ \sbe ->
         subParser "create"
         $ Opt.info (pGenesisCreate sbe envCli)
         $ Opt.progDesc
         $ mconcat
             [ "Create a Shelley genesis file from a genesis "
             , "template and genesis/delegation/spending keys."
             ]
-    , forEraInEonMaybe era $ \sbe -> do
+    , forEraInEonMaybe era $ \sbe ->
         subParser "create-staked"
         $ Opt.info (pGenesisCreateStaked sbe envCli)
         $ Opt.progDesc
         $ mconcat
             [ "Create a staked Shelley genesis file from a genesis "
             , "template and genesis/delegation/spending keys."
             ]
-    , forEraInEonMaybe era $ \sbe -> do
+    , forEraInEonMaybe era $ \sbe ->
         subParser "create-testnet-data"
         $ Opt.info (pGenesisCreateTestNetData sbe envCli)
         $ Opt.progDesc
@@ -143,9 +143,9 @@ pGenesisTxIn envCli =
     <*> pNetworkId envCli
     <*> pMaybeOutputFile
 
-pGenesisCreateCardano :: EnvCli -> Parser (GenesisCmds era)
-pGenesisCreateCardano envCli =
-  fmap GenesisCreateCardano $ GenesisCreateCardanoCmdArgs
+pGenesisCreateCardano :: ShelleyBasedEra era -> EnvCli -> Parser (GenesisCmds era)
+pGenesisCreateCardano sbe envCli =
+  fmap GenesisCreateCardano $ GenesisCreateCardanoCmdArgs sbe
     <$> pGenesisDir
     <*> pGenesisNumGenesisKeys
     <*> pGenesisNumUTxOKeys

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
@@ -348,11 +348,12 @@ generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys = do
 --
 
 runGenesisCreateCardanoCmd
-  :: GenesisCreateCardanoCmdArgs
+  :: GenesisCreateCardanoCmdArgs era
   -> ExceptT GenesisCmdError IO ()
 runGenesisCreateCardanoCmd
     Cmd.GenesisCreateCardanoCmdArgs
-    { Cmd.genesisDir
+    { Cmd.eon
+    , Cmd.genesisDir
     , Cmd.numGenesisKeys
     , Cmd.numUTxOKeys
     , Cmd.mSystemStart
@@ -392,6 +393,7 @@ runGenesisCreateCardanoCmd
     utxoKeys = gsPoorSecrets byronSecrets
     byronUtxoKeys = map (ByronSigningKey . Genesis.poorSecretToKey) utxoKeys
     shelleyUtxoKeys = map (convertPoor . Genesis.poorSecretToKey) utxoKeys
+    era = toCardanoEra eon
 
   dlgCerts <- convertToShelleyError $ mapM (findDelegateCert byronGenesis) byronDelegateKeys
   let
@@ -407,7 +409,7 @@ runGenesisCreateCardanoCmd
       , sgSlotLength = L.secondsToNominalDiffTimeMicro $ MkFixed (fromIntegral slotLength) * 1_000
       }
   shelleyGenesisTemplate' <- overrideShelleyGenesis <$> decodeShelleyGenesisFile shelleyGenesisTemplate
-  alonzoGenesis <- decodeAlonzoGenesisFile undefined alonzoGenesisTemplate -- FIXME!!!
+  alonzoGenesis <- decodeAlonzoGenesisFile (Just era) alonzoGenesisTemplate -- FIXME!!!
   conwayGenesis <- decodeConwayGenesisFile conwayGenesisTemplate
   (delegateMap, vrfKeys, kesKeys, opCerts) <- liftIO $ generateShelleyNodeSecrets shelleyDelegateKeys shelleyGenesisvkeys
   let

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Commands/Genesis.hs
@@ -25,6 +25,7 @@ data LegacyGenesisCmds
       (Maybe Coin)
       NetworkId
   | GenesisCreateCardano
+      (EraInEon ShelleyBasedEra)
       GenesisDir
       Word
       Word

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -994,7 +994,8 @@ pGenesisCmds envCli =
     pGenesisCreateCardano :: Parser LegacyGenesisCmds
     pGenesisCreateCardano =
       GenesisCreateCardano
-        <$> pGenesisDir
+        <$> pAnyShelleyBasedEra envCli
+        <*> pGenesisDir
         <*> pGenesisNumGenesisKeys
         <*> pGenesisNumUTxOKeys
         <*> pMaybeSystemStart

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Legacy/Run/Genesis.hs
@@ -40,8 +40,8 @@ runLegacyGenesisCmds = \case
     runLegacyGenesisAddrCmd vk nw mOutFile
   GenesisCreate eSbe fmt gd gn un ms am nw ->
     runLegacyGenesisCreateCmd eSbe fmt gd gn un ms am nw
-  GenesisCreateCardano gd gn un ms am k slotLength sc nw bg sg ag cg mNodeCfg ->
-    runLegacyGenesisCreateCardanoCmd gd gn un ms am k slotLength sc nw bg sg ag cg mNodeCfg
+  GenesisCreateCardano eSbe gd gn un ms am k slotLength sc nw bg sg ag cg mNodeCfg ->
+    runLegacyGenesisCreateCardanoCmd eSbe gd gn un ms am k slotLength sc nw bg sg ag cg mNodeCfg
   GenesisCreateStaked fmt gd gn gp gl un ms am ds nw bf bp su relayJsonFp ->
     runLegacyGenesisCreateStakedCmd fmt gd gn gp gl un ms am ds nw bf bp su relayJsonFp
   GenesisHashFile gf ->
@@ -141,7 +141,8 @@ runLegacyGenesisCreateCmd (EraInEon asbe) fmt genDir nGenKeys nUTxOKeys mStart m
     }
 
 runLegacyGenesisCreateCardanoCmd :: ()
-  => GenesisDir
+  => EraInEon ShelleyBasedEra
+  -> GenesisDir
   -> Word  -- ^ num genesis & delegate keys to make
   -> Word  -- ^ num utxo keys to make
   -> Maybe SystemStart
@@ -157,11 +158,12 @@ runLegacyGenesisCreateCardanoCmd :: ()
   -> Maybe FilePath
   -> ExceptT GenesisCmdError IO ()
 runLegacyGenesisCreateCardanoCmd
-    genDir nGenKeys nUTxOKeys mStart mSupply security slotLength slotCoeff
+    (EraInEon sbe) genDir nGenKeys nUTxOKeys mStart mSupply security slotLength slotCoeff
     network byronGenesis shelleyGenesis alonzoGenesis conwayGenesis mNodeCfg
     = runGenesisCreateCardanoCmd
     Cmd.GenesisCreateCardanoCmdArgs
-    { Cmd.genesisDir = genDir
+    { Cmd.eon = sbe
+    , Cmd.genesisDir = genDir
     , Cmd.numGenesisKeys = nGenKeys
     , Cmd.numUTxOKeys = nUTxOKeys
     , Cmd.mSystemStart = mStart