Propagate updated readFilePlutusScript

Author: Jimbo4350

cardano-cli/src/Cardano/CLI/Compatible/Transaction/ScriptWitness.hs

@@ -11,10 +11,11 @@ module Cardano.CLI.Compatible.Transaction.ScriptWitness
 where
 
 import Cardano.Api
-  ( AnyPlutusScriptVersion (..)
-  , AnyShelleyBasedEra (..)
+  ( AnyShelleyBasedEra (..)
   , File (..)
+  , IsPlutusScriptLanguage
   , PlutusScriptOrReferenceInput (..)
+  , PlutusScriptVersion (..)
   , Script (..)
   , ScriptDatum (..)
   , ScriptLanguage (..)
@@ -26,14 +27,23 @@ import Cardano.Api
   , shelleyBasedEraConstraints
   )
 import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Experimental.Plutus (fromPlutusSLanguage)
+import Cardano.Api.Experimental.Plutus qualified as Exp
 
 import Cardano.CLI.Compatible.Exception
+import Cardano.CLI.Compatible.Read
 import Cardano.CLI.EraBased.Script.Certificate.Type
-import Cardano.CLI.EraBased.Script.Read.Common
+import Cardano.CLI.EraBased.Script.Read.Common (readScriptDataOrFile)
 import Cardano.CLI.EraBased.Script.Type
+  ( CliScriptWitnessError (..)
+  , NoPolicyId (..)
+  , OnDiskPlutusScriptCliArgs (..)
+  , ScriptRequirements (..)
+  , SimpleRefScriptCliArgs (..)
+  )
 import Cardano.CLI.EraBased.Script.Type qualified as Exp
-import Cardano.CLI.Read
-import Cardano.CLI.Type.Common (CertificateFile)
+import Cardano.CLI.Type.Common (AnySLanguage (..), CertificateFile)
+import Cardano.Ledger.Plutus.Language qualified as L
 
 import Control.Monad
 
@@ -64,8 +74,7 @@ readCertificateScriptWitness sbe certScriptReq =
     OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits) -> do
         let plutusScriptFp = unFile scriptFp
-        plutusScript <-
-          readFilePlutusScript plutusScriptFp
+        plutusScript <- readFilePlutusScript plutusScriptFp
         redeemer <-
           fromExceptTCli $
             readScriptDataOrFile redeemerFile
@@ -75,7 +84,7 @@ readCertificateScriptWitness sbe certScriptReq =
             sLangSupported <-
               fromMaybeCli
                 ( PlutusScriptWitnessLanguageNotSupportedInEra
-                    (AnyPlutusScriptVersion lang)
+                    (fromOldScriptLanguage lang)
                     (shelleyBasedEraConstraints sbe $ AnyShelleyBasedEra sbe)
                 )
                 $ scriptLanguageSupportedInEra sbe
@@ -98,33 +107,51 @@ readCertificateScriptWitness sbe certScriptReq =
     PlutusReferenceScript
       ( PlutusRefScriptCliArgs
           refTxIn
-          anyPlutusScriptVersion
+          (AnySLanguage lang)
           Exp.NoScriptDatumAllowed
           Exp.NoPolicyId
           redeemerFile
           execUnits
         ) -> do
-        case anyPlutusScriptVersion of
-          AnyPlutusScriptVersion lang -> do
-            let pScript = PReferenceScript refTxIn
-            redeemer <-
-              fromExceptTCli $
-                readScriptDataOrFile redeemerFile
-            sLangSupported <-
-              fromMaybeCli
-                ( PlutusScriptWitnessLanguageNotSupportedInEra
-                    (AnyPlutusScriptVersion lang)
-                    (shelleyBasedEraConstraints sbe $ AnyShelleyBasedEra sbe)
-                )
-                $ scriptLanguageSupportedInEra sbe
-                $ PlutusScriptLanguage lang
+        let pScript = PReferenceScript refTxIn
+        redeemer <-
+          fromExceptTCli $
+            readScriptDataOrFile redeemerFile
+        sLangSupported <-
+          fromMaybeCli
+            ( PlutusScriptWitnessLanguageNotSupportedInEra
+                (L.plutusLanguage lang)
+                (shelleyBasedEraConstraints sbe $ AnyShelleyBasedEra sbe)
+            )
+            $ scriptLanguageSupportedInEra sbe
+            $ obtainIsPlutusScriptLanguage (fromPlutusSLanguage lang)
+            $ PlutusScriptLanguage
+            $ Exp.fromPlutusSLanguage lang
 
-            return $
-              CertificateScriptWitness $
-                PlutusScriptWitness
-                  sLangSupported
-                  lang
-                  pScript
-                  NoScriptDatumForStake
-                  redeemer
-                  execUnits
+        return $
+          CertificateScriptWitness $
+            obtainIsPlutusScriptLanguage (fromPlutusSLanguage lang) $
+              PlutusScriptWitness
+                sLangSupported
+                (Exp.fromPlutusSLanguage lang)
+                pScript
+                NoScriptDatumForStake
+                redeemer
+                execUnits
+
+fromOldScriptLanguage :: PlutusScriptVersion lang -> L.Language
+fromOldScriptLanguage PlutusScriptV1 = L.PlutusV1
+fromOldScriptLanguage PlutusScriptV2 = L.PlutusV2
+fromOldScriptLanguage PlutusScriptV3 = L.PlutusV3
+fromOldScriptLanguage PlutusScriptV4 = L.PlutusV4
+
+obtainIsPlutusScriptLanguage
+  :: PlutusScriptVersion lang
+  -> (IsPlutusScriptLanguage lang => a)
+  -> a
+obtainIsPlutusScriptLanguage lang f =
+  case lang of
+    PlutusScriptV1 -> f
+    PlutusScriptV2 -> f
+    PlutusScriptV3 -> f
+    PlutusScriptV4 -> f

cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs

@@ -12,22 +12,17 @@ module Cardano.CLI.EraBased.Script.Certificate.Read
 where
 
 import Cardano.Api (File (..))
-import Cardano.Api qualified as Api
 import Cardano.Api.Experimental
 import Cardano.Api.Experimental qualified as Exp
-import Cardano.Api.Ledger qualified as L
-import Cardano.Api.Plutus (AnyPlutusScriptVersion (..), ToLedgerPlutusLanguage)
+import Cardano.Api.Experimental.AnyScriptWitness
+import Cardano.Api.Experimental.Plutus qualified as Exp
 
 import Cardano.CLI.Compatible.Exception
--- import Cardano.CLI.EraBased.Script.Certificate.Type
 import Cardano.CLI.EraBased.Script.Read.Common
 import Cardano.CLI.EraBased.Script.Type
 import Cardano.CLI.Orphan ()
 import Cardano.CLI.Read
-import Cardano.CLI.Type.Common (CertificateFile)
-import Cardano.Ledger.Core qualified as L
-import Cardano.Ledger.Plutus.Language qualified as L
-import Cardano.Ledger.Plutus.Language qualified as Plutus
+import Cardano.CLI.Type.Common (AnySLanguage (..), CertificateFile)
 
 readCertificateScriptWitness
   :: forall era e
@@ -36,98 +31,59 @@ readCertificateScriptWitness
   -> CIO e (AnyWitness (LedgerEra era))
 readCertificateScriptWitness (OnDiskSimpleScript scriptFp) = do
   let sFp = unFile scriptFp
-  s <-
-    readFileSimpleScript sFp
-  let nativeScript :: SimpleScript (LedgerEra era) = convertTotimelock useEra s
-  return $
-    AnySimpleScriptWitness $
-      SScript nativeScript
+  AnySimpleScriptWitness . SScript <$> readFileSimpleScript sFp useEra
 readCertificateScriptWitness
   ( OnDiskPlutusScript
       (OnDiskPlutusScriptCliArgs scriptFp Exp.NoScriptDatumAllowed redeemerFile execUnits)
     ) = do
     let plutusScriptFp = unFile scriptFp
-    AnyPlutusScript sVer apiScript <-
-      readFilePlutusScript plutusScriptFp
+    Exp.AnyPlutusScript script <-
+      readFilePlutusScript @_ @era plutusScriptFp
 
-    let lang = toPlutusSLanguage sVer
-    script <- decodePlutusScript useEra sVer apiScript
+    let
+      lang = Exp.plutusScriptInEraSLanguage script
+      script' = PScript script
 
     redeemer <-
       fromExceptTCli $
         readScriptDataOrFile redeemerFile
+
+    let sw =
+          PlutusScriptWitness
+            lang
+            script'
+            NoScriptDatum
+            redeemer
+            execUnits
     return $
       AnyPlutusScriptWitness $
-        PlutusScriptWitness
-          lang
-          script
-          NoScriptDatum
-          redeemer
-          execUnits
+        AnyPlutusCertifyingScriptWitness sw
 readCertificateScriptWitness
   ( PlutusReferenceScript
       ( PlutusRefScriptCliArgs
           refInput
-          (AnyPlutusScriptVersion sVer)
+          (AnySLanguage lang)
           Exp.NoScriptDatumAllowed
           NoPolicyId
           redeemerFile
           execUnits
         )
     ) = do
-    let lang = toPlutusSLanguage sVer
     redeemer <-
       fromExceptTCli $
         readScriptDataOrFile redeemerFile
     return $
       AnyPlutusScriptWitness $
-        PlutusScriptWitness
-          lang
-          (PReferenceScript refInput)
-          NoScriptDatum
-          redeemer
-          execUnits
+        AnyPlutusCertifyingScriptWitness $
+          PlutusScriptWitness
+            lang
+            (PReferenceScript refInput)
+            NoScriptDatum
+            redeemer
+            execUnits
 readCertificateScriptWitness (SimpleReferenceScript (SimpleRefScriptArgs refTxin NoPolicyId)) =
   return . AnySimpleScriptWitness $ SReferenceScript refTxin
 
-decodePlutusScript
-  :: forall era lang e
-   . Era era
-  -> Api.PlutusScriptVersion lang
-  -> Api.PlutusScript lang
-  -> CIO e (PlutusScriptOrReferenceInput (ToLedgerPlutusLanguage lang) (LedgerEra era))
-decodePlutusScript era sVer (Api.PlutusScriptSerialised script) = obtainConstraints sVer $ do
-  let runnableScriptBs = L.Plutus $ L.PlutusBinary script
-  plutusRunnable <-
-    fromEitherCli $
-      Plutus.decodePlutusRunnable
-        (getVersion era)
-        runnableScriptBs
-  return $ PScript (PlutusScriptInEra plutusRunnable)
-
-obtainConstraints
-  :: Api.PlutusScriptVersion lang
-  -> (L.PlutusLanguage (ToLedgerPlutusLanguage lang) => a)
-  -> a
-obtainConstraints v =
-  case v of
-    Api.PlutusScriptV1 -> id
-    Api.PlutusScriptV2 -> id
-    Api.PlutusScriptV3 -> id
-    Api.PlutusScriptV4 -> id
-
-getVersion :: forall era. Era era -> L.Version
-getVersion e = obtainCommonConstraints e $ L.eraProtVerLow @(LedgerEra era)
-
-convertTotimelock
-  :: forall era
-   . Era era
-  -> Api.Script Api.SimpleScript'
-  -> SimpleScript (LedgerEra era)
-convertTotimelock era (Api.SimpleScript s) =
-  let native :: L.NativeScript (LedgerEra era) = obtainCommonConstraints era $ Api.toAllegraTimelock s
-   in obtainCommonConstraints era $ SimpleScript native
-
 readCertificateScriptWitnesses
   :: IsEra era
   => [(CertificateFile, Maybe (ScriptRequirements Exp.CertItem))]