inital attempt

IntersectMBO · Jul 8, 2024 · 528e2c6 · 528e2c6
1 parent 772537c
commit 528e2c6
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/CreateTestnetData.hs
@@ -195,7 +195,7 @@ runGenesisCreateTestNetDataCmd Cmd.GenesisCreateTestNetDataCmdArgs
   , numUtxoKeys
   , totalSupply
   , delegatedSupply
-   , relays
+  , relays
   , systemStart
   , outputDir
   } = do

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Genesis.hs
@@ -401,7 +401,7 @@ runGenesisCreateCardanoCmd
     overrideShelleyGenesis t = t
       { sgNetworkMagic = unNetworkMagic (toNetworkMagic network)
       , sgNetworkId = toShelleyNetwork network
-      , sgActiveSlotsCoeff = fromMaybe (error $ "Could not convert from Rational: " ++ show slotCoeff) $ L.boundRational slotCoeff
+      , sgActiveSlotsCoeff = unsafeBoundedRational slotCoeff
       , sgSecurityParam = unBlockCount security
       , sgUpdateQuorum = fromIntegral $ ((numGenesisKeys `div` 3) * 2) + 1
       , sgEpochLength = EpochSize $ floor $ (fromIntegral (unBlockCount security) * 10) / slotCoeff

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs b/cardano-cli/src/Cardano/CLI/EraBased/Run/Query.hs
@@ -173,8 +173,8 @@ runQueryProtocolParametersCmd
   AnyCardanoEra era <- firstExceptT QueryCmdAcquireFailure $ determineEra localNodeConnInfo
   sbe <- forEraInEon @ShelleyBasedEra era (left QueryCmdByronEra) pure
   let qInMode = QueryInEra $ QueryInShelleyBasedEra sbe Api.QueryProtocolParameters
-  pp <- firstExceptT QueryCmdConvenienceError
-          $ executeQueryAnyMode localNodeConnInfo qInMode
+  pp <- executeQueryAnyMode localNodeConnInfo qInMode
+          & modifyError QueryCmdConvenienceError
   writeProtocolParameters sbe mOutFile pp
   where
     writeProtocolParameters
@@ -654,7 +654,8 @@ runQueryTxMempoolCmd
 
   localQuery <- case query of
       TxMempoolQueryTxExists tx -> do
-        AnyCardanoEra era <- modifyError QueryCmdAcquireFailure (determineEra localNodeConnInfo)
+        AnyCardanoEra era <- determineEra localNodeConnInfo
+          & modifyError QueryCmdAcquireFailure
         pure $ LocalTxMonitoringQueryTx $ TxIdInMode era tx
       TxMempoolQueryNextTx -> pure LocalTxMonitoringSendNextTx
       TxMempoolQueryInfo -> pure LocalTxMonitoringMempoolInformation

diff --git a/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs b/cardano-cli/src/Cardano/CLI/Run/Debug/LogEpochState.hs
@@ -28,6 +28,7 @@ runLogEpochStateCmd
   LBS.appendFile outputFilePath ""
 
   result <- runExceptT $ foldEpochState
+    AlonzoEraOnwardsConway -- FIXME: get this from somewhere, prolly query the node beforehand for an era
     configurationFile
     nodeSocketPath
     Api.QuickValidation