Propagate Cardano.CLI.Shelley.Run.Read and Cardano.CLI.Shelley.Run.Va…

…lidate throughout cardano-cli Delete Cardano.CLI.Shelley.Script Remove CddlTx data type
IntersectMBO · Oct 10, 2022 · 44bee30 · 44bee30
1 parent 84b6a13
commit 44bee30
Show file tree

Hide file tree

Showing 8 changed files with 209 additions and 925 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -87,7 +87,8 @@ library
                         Cardano.CLI.Shelley.Run.StakeAddress
                         Cardano.CLI.Shelley.Run.TextView
                         Cardano.CLI.Shelley.Run.Transaction
-                        Cardano.CLI.Shelley.Script
+                        Cardano.CLI.Shelley.Run.Read
+                        Cardano.CLI.Shelley.Run.Validate
 
                         Cardano.CLI.TopHandler
 

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Address.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Address.hs
@@ -31,7 +31,7 @@ import           Cardano.CLI.Shelley.Key (InputDecodeError, PaymentVerifier (..)
                    readVerificationKeyTextOrFileAnyOf, renderVerificationKeyTextOrFileError)
 import           Cardano.CLI.Shelley.Parsers (AddressCmd (..), AddressKeyType (..), OutputFile (..))
 import           Cardano.CLI.Shelley.Run.Address.Info (ShelleyAddressInfoError, runAddressInfo)
-import           Cardano.CLI.Shelley.Script
+import           Cardano.CLI.Shelley.Run.Read
 import           Cardano.CLI.Types
 
 data ShelleyAddressCmdError

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs
@@ -20,6 +20,12 @@ module Cardano.CLI.Shelley.Run.Genesis
   , readAndDecodeShelleyGenesis
   , readAlonzoGenesis
   , runGenesisCmd
+
+  -- * Protocol Parameters
+  , ProtocolParamsError(..)
+  , renderProtocolParamsError
+  , readProtocolParameters
+  , readProtocolParametersSourceSpec
   ) where
 
 import           Cardano.Prelude hiding (unlines)
@@ -104,7 +110,7 @@ import           Cardano.Chain.Common (BlockCount (unBlockCount))
 import           Cardano.Chain.Delegation (delegateVK)
 import qualified Cardano.Chain.Delegation as Dlg
 import qualified Cardano.Chain.Genesis as Genesis
-import           Cardano.Chain.Update
+import           Cardano.Chain.Update hiding (ProtocolParameters)
 import           Cardano.Slotting.Slot (EpochSize (EpochSize))
 import           Data.Fixed (Fixed (MkFixed))
 import qualified Data.Yaml as Yaml
@@ -1314,3 +1320,36 @@ readAlonzoGenesis fpath = do
   lbs <- handleIOExceptT (ShelleyGenesisCmdGenesisFileError . FileIOError fpath) $ LBS.readFile fpath
   firstExceptT (ShelleyGenesisCmdAesonDecodeError fpath . Text.pack)
     . hoistEither $ Aeson.eitherDecode' lbs
+
+
+-- Protocol Parameters
+
+data ProtocolParamsError
+  = ProtocolParamsErrorFile (FileError ())
+  | ProtocolParamsErrorJSON !FilePath !Text
+  | ProtocolParamsErrorGenesis !ShelleyGenesisCmdError
+
+renderProtocolParamsError :: ProtocolParamsError -> Text
+renderProtocolParamsError (ProtocolParamsErrorFile fileErr) =
+  Text.pack $ displayError fileErr
+renderProtocolParamsError (ProtocolParamsErrorJSON fp jsonErr) =
+  "Error while decoding the protocol parameters at: " <> Text.pack fp <> " Error: " <> jsonErr
+renderProtocolParamsError (ProtocolParamsErrorGenesis err) =
+  Text.pack $ displayError  err
+
+readProtocolParametersSourceSpec :: ProtocolParamsSourceSpec
+                                 -> ExceptT ProtocolParamsError IO ProtocolParameters
+readProtocolParametersSourceSpec (ParamsFromGenesis (GenesisFile f)) =
+  fromShelleyPParams . sgProtocolParams
+    <$> firstExceptT ProtocolParamsErrorGenesis (readShelleyGenesisWithDefault f id)
+readProtocolParametersSourceSpec (ParamsFromFile f) = readProtocolParameters f
+
+--TODO: eliminate this and get only the necessary params, and get them in a more
+-- helpful way rather than requiring them as a local file.
+readProtocolParameters :: ProtocolParamsFile
+                       -> ExceptT ProtocolParamsError IO ProtocolParameters
+readProtocolParameters (ProtocolParamsFile fpath) = do
+  pparams <- handleIOExceptT (ProtocolParamsErrorFile . FileIOError fpath) $ LBS.readFile fpath
+  firstExceptT (ProtocolParamsErrorJSON fpath . Text.pack) . hoistEither $
+    Aeson.eitherDecode' pparams
+
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/StakeAddress.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/StakeAddress.hs
@@ -20,7 +20,7 @@ import           Cardano.CLI.Shelley.Key (InputDecodeError, StakeVerifier (..),
                    VerificationKeyOrFile, VerificationKeyOrHashOrFile, readVerificationKeyOrFile,
                    readVerificationKeyOrHashOrFile)
 import           Cardano.CLI.Shelley.Parsers
-import           Cardano.CLI.Shelley.Script (ScriptDecodeError, readFileScriptInAnyLang)
+import           Cardano.CLI.Shelley.Run.Read
 import           Cardano.CLI.Types
 
 data ShelleyStakeAddressCmdError

diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Transaction.hs
diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Script.hs b/cardano-cli/src/Cardano/CLI/Shelley/Script.hs
diff --git a/cardano-cli/src/Cardano/CLI/Types.hs b/cardano-cli/src/Cardano/CLI/Types.hs
@@ -7,7 +7,6 @@
 module Cardano.CLI.Types
   ( BalanceTxExecUnits (..)
   , CBORObject (..)
-  , CddlTx (..)
   , CertificateFile (..)
   , CurrentKesPeriod (..)
   , EpochLeadershipSchedule (..)
@@ -51,8 +50,8 @@ import           Data.Word (Word64)
 import qualified Cardano.Chain.Slotting as Byron
 
 import           Cardano.Api (AddressAny, AnyScriptLanguage, EpochNo, ExecutionUnits, Hash,
-                   InAnyCardanoEra, PaymentKey, PolicyId, ScriptData, SlotNo (SlotNo), Tx, TxIn,
-                   Value, WitCtxMint, WitCtxStake, WitCtxTxIn)
+                   PaymentKey, PolicyId, ScriptData, SlotNo (SlotNo), TxIn, Value, WitCtxMint,
+                   WitCtxStake, WitCtxTxIn)
 
 import qualified Cardano.Ledger.Crypto as Crypto
 
@@ -74,8 +73,6 @@ data CBORObject = CBORBlockByron Byron.EpochSlots
                 | CBORVoteByron
                 deriving Show
 
-newtype CddlTx = CddlTx {unCddlTx :: InAnyCardanoEra Tx} deriving (Show, Eq)
-
 -- Encompasses stake certificates, stake pool certificates,
 -- genesis delegate certificates and MIR certificates.
 newtype CertificateFile = CertificateFile { unCertificateFile :: FilePath }

diff --git a/cardano-cli/test/Test/OptParse.hs b/cardano-cli/test/Test/OptParse.hs
@@ -18,7 +18,7 @@ import qualified GHC.Stack as GHC
 
 import           Cardano.Api
 
-import           Cardano.CLI.Shelley.Run.Transaction
+import           Cardano.CLI.Shelley.Run.Read
 
 import qualified Hedgehog as H
 import qualified Hedgehog.Extras.Test.Process as H