Add TxCmdCliScriptWitnessError to TxCmdError

Add ScriptDecodeUnknownPlutusScriptVersion to ScriptDecodeError
IntersectMBO · Nov 21, 2024 · 34281ab · 34281ab
1 parent e567a54
commit 34281ab
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -135,6 +135,7 @@ library
     Cardano.CLI.Options.Key
     Cardano.CLI.Options.Node
     Cardano.CLI.Options.Ping
+    Cardano.CLI.Plutus.Minting
     Cardano.CLI.Orphans
     Cardano.CLI.Parser
     Cardano.CLI.Read

diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/ScriptDecodeError.hs
@@ -7,13 +7,16 @@ where
 
 import           Cardano.Api
 
+import           Data.Text
+
 --
 -- Handling decoding the variety of script languages and formats
 --
 
 data ScriptDecodeError
   = ScriptDecodeTextEnvelopeError TextEnvelopeError
   | ScriptDecodeSimpleScriptError JsonDecodeError
+  | ScriptDecodeUnknownPlutusScriptVersion Text
   deriving Show
 
 instance Error ScriptDecodeError where
@@ -22,3 +25,5 @@ instance Error ScriptDecodeError where
       "Error decoding script: " <> prettyError err
     ScriptDecodeSimpleScriptError err ->
       "Syntax error in script: " <> prettyError err
+    ScriptDecodeUnknownPlutusScriptVersion version ->
+      "Unknown Plutus script version: " <> pshow version
diff --git a/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs b/cardano-cli/src/Cardano/CLI/Types/Errors/TxCmdError.hs
@@ -19,6 +19,7 @@ import           Cardano.Api.Consensus (EraMismatch (..))
 import qualified Cardano.Api.Ledger as L
 import           Cardano.Api.Shelley
 
+import           Cardano.CLI.Plutus.Minting
 import           Cardano.CLI.Read
 import           Cardano.CLI.Types.Common
 import           Cardano.CLI.Types.Errors.BootstrapWitnessError
@@ -50,6 +51,7 @@ data TxCmdError
   | TxCmdScriptWitnessError ScriptWitnessError
   | TxCmdProtocolParamsError ProtocolParamsError
   | TxCmdScriptFileError (FileError ScriptDecodeError)
+  | TxCmdCliScriptWitnessError !(FileError CliScriptWitnessError)
   | TxCmdKeyFileError (FileError InputDecodeError)
   | TxCmdReadTextViewFileError !(FileError TextEnvelopeError)
   | TxCmdReadWitnessSigningDataError !ReadWitnessSigningDataError
@@ -105,6 +107,8 @@ renderTxCmdError = \case
     prettyError fileErr
   TxCmdScriptFileError fileErr ->
     prettyError fileErr
+  TxCmdCliScriptWitnessError cliScriptWitnessErr ->
+    prettyError cliScriptWitnessErr
   TxCmdKeyFileError fileErr ->
     prettyError fileErr
   TxCmdReadWitnessSigningDataError witSignDataErr ->