WIP

Author: Jimbo4350

cabal.project

@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2025-11-05T09:40:54Z
-  , cardano-haskell-packages 2025-11-24T10:27:41Z
+  , hackage.haskell.org 2025-12-02T22:23:29Z
+  , cardano-haskell-packages 2025-12-16T19:04:42Z
 
 packages:
   cardano-cli
@@ -66,3 +66,11 @@ if impl (ghc >= 9.12)
 -- IMPORTANT
 -- Do NOT add more source-repository-package stanzas here unless they are strictly
 -- temporary! Please read the section in CONTRIBUTING about updating dependencies.
+
+
+source-repository-package
+   type:     git
+   location: https://github.com/IntersectMBO/cardano-api.git
+   tag:      2adba748a22666f6258096081680605e9ed97e70
+   --sha256: sha256-ZBydyRVLreT723M9N8pljl4rQ6RL4qwJsfIdJC4psD4=
+   subdir:   cardano-api

cardano-cli/cardano-cli.cabal

@@ -67,6 +67,7 @@ library
     Cardano.CLI.Compatible.Governance.Types
     Cardano.CLI.Compatible.Json.Friendly
     Cardano.CLI.Compatible.Option
+    Cardano.CLI.Compatible.Read
     Cardano.CLI.Compatible.Run
     Cardano.CLI.Compatible.StakeAddress.Command
     Cardano.CLI.Compatible.StakeAddress.Option
@@ -241,7 +242,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=10.20,
+    cardano-api ^>=10.21,
     cardano-binary,
     cardano-crypto,
     cardano-crypto-class ^>=2.2.3.2,
@@ -280,6 +281,7 @@ library
     network,
     network-uri,
     optparse-applicative-fork,
+    ordered-containers,
     ouroboros-consensus,
     ouroboros-consensus-cardano,
     prettyprinter,

cardano-cli/src/Cardano/CLI/Compatible/Command.hs

@@ -20,10 +20,9 @@ import Cardano.CLI.Compatible.StakePool.Command
 import Cardano.CLI.Compatible.Transaction.Command
 
 import Data.Text
-import Data.Typeable (Typeable)
 
 data AnyCompatibleCommand where
-  AnyCompatibleCommand :: Typeable era => CompatibleCommand era -> AnyCompatibleCommand
+  AnyCompatibleCommand :: CompatibleCommand era -> AnyCompatibleCommand
 
 renderAnyCompatibleCommand :: AnyCompatibleCommand -> Text
 renderAnyCompatibleCommand = \case

cardano-cli/src/Cardano/CLI/EraBased/Common/Option.hs

@@ -34,6 +34,7 @@ import Cardano.CLI.Type.Governance
 import Cardano.CLI.Type.Key
 import Cardano.CLI.Type.Key.VerificationKey
 import Cardano.Ledger.BaseTypes (NonZero, nonZero)
+import Cardano.Ledger.Plutus.Language qualified as L
 
 import Control.Monad (void, when)
 import Data.Aeson qualified as Aeson
@@ -1125,7 +1126,7 @@ pVoteReferencePlutusScriptWitness prefix autoBalanceExecUnits =
   let appendedPrefix = prefix ++ "-"
    in Voting.createPlutusReferenceScriptFromCliArgs
         <$> pReferenceTxIn appendedPrefix "plutus"
-        <*> plutusP appendedPrefix PlutusScriptV3 "v3"
+        <*> plutusSLanguageP appendedPrefix L.SPlutusV3 "v3"
         <*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
         <*> ( case autoBalanceExecUnits of
                 AutoBalance -> pure (ExecutionUnits 0 0)
@@ -1183,7 +1184,7 @@ pProposalReferencePlutusScriptWitness prefix autoBalanceExecUnits =
   let appendedPrefix = prefix ++ "-"
    in Proposing.createPlutusReferenceScriptFromCliArgs
         <$> pReferenceTxIn appendedPrefix "plutus"
-        <*> plutusP appendedPrefix PlutusScriptV3 "v3"
+        <*> plutusSLanguageP appendedPrefix L.SPlutusV3 "v3"
         <*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
         <*> ( case autoBalanceExecUnits of
                 AutoBalance -> pure (ExecutionUnits 0 0)
@@ -1383,7 +1384,7 @@ pCertificateReferencePlutusScriptWitness prefix autoBalanceExecUnits =
   let appendedPrefix = prefix ++ "-"
    in Certifying.createPlutusReferenceScriptFromCliArgs
         <$> pReferenceTxIn appendedPrefix "plutus"
-        <*> pPlutusScriptLanguage appendedPrefix
+        <*> pAnyPlutusSLanguage appendedPrefix
         <*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
         <*> ( case autoBalanceExecUnits of
                 AutoBalance -> pure (ExecutionUnits 0 0)
@@ -1498,7 +1499,7 @@ pWithdrawalReferencePlutusScriptWitness prefix autoBalanceExecUnits =
   let appendedPrefix = prefix ++ "-"
    in Withdrawal.createPlutusReferenceScriptFromCliArgs
         <$> pReferenceTxIn appendedPrefix "plutus"
-        <*> pPlutusScriptLanguage appendedPrefix
+        <*> pAnyPlutusSLanguage appendedPrefix
         <*> pScriptRedeemerOrFile (appendedPrefix ++ "reference-tx-in")
         <*> ( case autoBalanceExecUnits of
                 AutoBalance -> pure (ExecutionUnits 0 0)
@@ -1508,6 +1509,20 @@ pWithdrawalReferencePlutusScriptWitness prefix autoBalanceExecUnits =
 pPlutusScriptLanguage :: String -> Parser AnyPlutusScriptVersion
 pPlutusScriptLanguage prefix = plutusP prefix PlutusScriptV2 "v2" <|> plutusP prefix PlutusScriptV3 "v3"
 
+pAnyPlutusSLanguage :: String -> Parser AnySLanguage
+pAnyPlutusSLanguage prefix =
+  plutusSLanguageP prefix L.SPlutusV2 "v2" <|> plutusSLanguageP prefix L.SPlutusV3 "v3"
+
+plutusSLanguageP
+  :: L.PlutusLanguage lang
+  => String -> L.SLanguage lang -> String -> Parser AnySLanguage
+plutusSLanguageP prefix plutusVersion versionString =
+  Opt.flag'
+    (AnySLanguage plutusVersion)
+    ( Opt.long (prefix <> "plutus-script-" <> versionString)
+        <> Opt.help ("Specify a plutus script " <> versionString <> " reference script.")
+    )
+
 plutusP
   :: IsPlutusScriptLanguage lang
   => String -> PlutusScriptVersion lang -> String -> Parser AnyPlutusScriptVersion
@@ -1955,7 +1970,7 @@ pTxIn balance =
   pPlutusReferenceSpendScriptWitness autoBalanceExecUnits =
     PlutusSpend.createPlutusReferenceScriptFromCliArgs
       <$> pReferenceTxIn "spending-" "plutus"
-      <*> pPlutusScriptLanguage "spending-"
+      <*> pAnyPlutusSLanguage "spending-"
       <*> pScriptDatumOrFileSpendingCip69 "spending-reference-tx-in"
       <*> pScriptRedeemerOrFile "spending-reference-tx-in"
       <*> ( case autoBalanceExecUnits of
@@ -2167,7 +2182,7 @@ pMintMultiAsset balanceExecUnits =
   pPlutusMintReferenceScriptWitnessFiles autoBalanceExecUnits =
     createPlutusReferenceScriptFromCliArgs
       <$> pReferenceTxIn "mint-" "plutus"
-      <*> pPlutusScriptLanguage "mint-"
+      <*> pAnyPlutusSLanguage "mint-"
       <*> pScriptRedeemerOrFile "mint-reference-tx-in"
       <*> ( case autoBalanceExecUnits of
               AutoBalance -> pure (ExecutionUnits 0 0)

cardano-cli/src/Cardano/CLI/EraBased/Governance/Actions/Run.hs

@@ -27,7 +27,6 @@ import Cardano.CLI.Compatible.Json.Friendly
 import Cardano.CLI.EraBased.Governance.Actions.Command
 import Cardano.CLI.EraBased.Governance.Actions.Command qualified as Cmd
 import Cardano.CLI.EraBased.Script.Proposal.Read
-import Cardano.CLI.EraBased.Script.Proposal.Type
 import Cardano.CLI.EraIndependent.Hash.Internal.Common (getByteStringFromURL, httpsAndIpfsSchemes)
 import Cardano.CLI.Read
 import Cardano.CLI.Type.Common
@@ -72,7 +71,7 @@ runGovernanceActionViewCmd
     , Cmd.mOutFile
     , Cmd.era
     } = Exp.obtainCommonConstraints era $ do
-    proposal :: (Proposal era, Maybe (ProposalScriptWitness era)) <-
+    proposal :: (Proposal era, Exp.AnyWitness (Exp.LedgerEra era)) <-
       readProposal (actionFile, Nothing)
 
     void $ friendlyProposal outputFormat mOutFile $ fst proposal

cardano-cli/src/Cardano/CLI/EraBased/Governance/Vote/Run.hs

@@ -15,6 +15,7 @@ where
 
 import Cardano.Api
 import Cardano.Api.Experimental (obtainCommonConstraints)
+import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Ledger qualified as L
 
 import Cardano.CLI.Compatible.Exception
@@ -103,7 +104,8 @@ runGovernanceVoteViewCmd
     , mOutFile
     } = do
     obtainCommonConstraints era $ do
-      voteProcedures <- fst <$> readVoteScriptWitness (convert era) (voteFile, Nothing)
+      voteProcedures :: VotingProcedures era <-
+        fst <$> obtainCommonConstraints (era :: Exp.Era era) (readVoteScriptWitness (voteFile, Nothing))
 
       let output =
             outputFormat

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

@@ -1,6 +1,7 @@
 {-# LANGUAGE DataKinds #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
+{-# LANGUAGE KindSignatures #-}
 
 module Cardano.CLI.EraBased.Script.Certificate.Type
   ( CertificateScriptWitness (..)
@@ -14,7 +15,7 @@ import Cardano.Api
 import Cardano.Api.Experimental
 
 import Cardano.CLI.EraBased.Script.Type
-import Cardano.CLI.Type.Common (ScriptDataOrFile)
+import Cardano.CLI.Type.Common (AnySLanguage (..), ScriptDataOrFile)
 
 newtype CertificateScriptWitness era
   = CertificateScriptWitness {cswScriptWitness :: ScriptWitness WitCtxStake era}
@@ -31,10 +32,10 @@ createSimpleOrPlutusScriptFromCliArgs scriptFp Nothing =
 
 createPlutusReferenceScriptFromCliArgs
   :: TxIn
-  -> AnyPlutusScriptVersion
+  -> AnySLanguage
   -> ScriptDataOrFile
   -> ExecutionUnits
   -> ScriptRequirements CertItem
-createPlutusReferenceScriptFromCliArgs txIn version redeemer execUnits =
+createPlutusReferenceScriptFromCliArgs txIn l redeemer execUnits =
   PlutusReferenceScript $
-    PlutusRefScriptCliArgs txIn version NoScriptDatumAllowed NoPolicyId redeemer execUnits
+    PlutusRefScriptCliArgs txIn l NoScriptDatumAllowed NoPolicyId redeemer execUnits

cardano-cli/src/Cardano/CLI/EraBased/Script/Mint/Type.hs

@@ -16,7 +16,7 @@ import Cardano.Api.Experimental
 import Cardano.Api.Experimental qualified as Exp
 
 import Cardano.CLI.EraBased.Script.Type
-import Cardano.CLI.Type.Common (ScriptDataOrFile)
+import Cardano.CLI.Type.Common (AnySLanguage (..), ScriptDataOrFile)
 
 -- We always need the policy id when constructing a transaction that mints.
 -- In the case of reference scripts, the user currently must provide the policy id (script hash)
@@ -47,7 +47,7 @@ createSimpleReferenceScriptFromCliArgs txin polid =
 
 createPlutusReferenceScriptFromCliArgs
   :: TxIn
-  -> AnyPlutusScriptVersion
+  -> AnySLanguage
   -> ScriptDataOrFile
   -> ExecutionUnits
   -> PolicyId

cardano-cli/src/Cardano/CLI/EraBased/Script/Proposal/Type.hs

@@ -4,7 +4,6 @@
 
 module Cardano.CLI.EraBased.Script.Proposal.Type
   ( PlutusRefScriptCliArgs (..)
-  , ProposalScriptWitness (..)
   , createSimpleOrPlutusScriptFromCliArgs
   , createPlutusReferenceScriptFromCliArgs
   )
@@ -15,11 +14,7 @@ import Cardano.Api.Experimental
 import Cardano.Api.Experimental qualified as Exp
 
 import Cardano.CLI.EraBased.Script.Type
-import Cardano.CLI.Type.Common (ScriptDataOrFile)
-
-newtype ProposalScriptWitness era
-  = ProposalScriptWitness {pswScriptWitness :: ScriptWitness WitCtxStake era}
-  deriving Show
+import Cardano.CLI.Type.Common (AnySLanguage (..), ScriptDataOrFile)
 
 createSimpleOrPlutusScriptFromCliArgs
   :: File ScriptInAnyLang In
@@ -32,10 +27,10 @@ createSimpleOrPlutusScriptFromCliArgs scriptFp Nothing =
 
 createPlutusReferenceScriptFromCliArgs
   :: TxIn
-  -> AnyPlutusScriptVersion
+  -> AnySLanguage
   -> ScriptDataOrFile
   -> ExecutionUnits
   -> ScriptRequirements ProposalItem
-createPlutusReferenceScriptFromCliArgs txIn version redeemer execUnits =
+createPlutusReferenceScriptFromCliArgs txIn anySLang redeemer execUnits =
   PlutusReferenceScript $
-    PlutusRefScriptCliArgs txIn version Exp.NoScriptDatumAllowed NoPolicyId redeemer execUnits
+    PlutusRefScriptCliArgs txIn anySLang Exp.NoScriptDatumAllowed NoPolicyId redeemer execUnits

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

@@ -1,6 +1,7 @@
 {-# LANGUAGE FlexibleContexts #-}
 {-# LANGUAGE GADTs #-}
 {-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE ScopedTypeVariables #-}
 
 module Cardano.CLI.EraBased.Script.Read.Common
   ( -- * Plutus Script Related
@@ -12,12 +13,14 @@ module Cardano.CLI.EraBased.Script.Read.Common
 where
 
 import Cardano.Api as Api
+import Cardano.Api.Experimental (obtainCommonConstraints)
+import Cardano.Api.Experimental qualified as Exp
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.Read (readFileCli)
 import Cardano.CLI.Type.Common
 import Cardano.CLI.Type.Error.ScriptDataError
-import Cardano.CLI.Type.Error.ScriptDecodeError
+import Cardano.Ledger.Core qualified as L
 
 import Prelude
 
@@ -26,32 +29,26 @@ import Data.Bifunctor
 import Data.ByteString qualified as BS
 import Data.ByteString.Lazy.Char8 qualified as LBS
 
-deserialiseSimpleScript
-  :: BS.ByteString
-  -> Either ScriptDecodeError (Script SimpleScript')
-deserialiseSimpleScript bs =
+-- TODO: Update to handle hex script bytes directly as well!
+readFileSimpleScript
+  :: forall era e
+   . FilePath
+  -> Exp.Era era
+  -> CIO e (Exp.SimpleScript (Exp.LedgerEra era))
+readFileSimpleScript file era = do
+  bs <- readFileCli file
   case deserialiseFromJSON bs of
-    Left _ ->
+    Left _ -> do
       -- In addition to the TextEnvelope format, we also try to
-      -- deserialize the JSON representation of SimpleScripts.
-      case Aeson.eitherDecodeStrict' bs of
-        Left err -> Left (ScriptDecodeSimpleScriptError $ JsonDecodeError err)
-        Right script -> Right $ SimpleScript script
-    Right te ->
-      case deserialiseFromTextEnvelopeAnyOf [teType'] te of
-        Left err -> Left (ScriptDecodeTextEnvelopeError err)
-        Right script -> Right script
- where
-  teType' :: FromSomeType HasTextEnvelope (Script SimpleScript')
-  teType' = FromSomeType (AsScript AsSimpleScript) id
-
-readFileSimpleScript
-  :: FilePath
-  -> CIO e (Script SimpleScript')
-readFileSimpleScript file = do
-  scriptBytes <- readFileCli file
-  fromEitherCli $
-    deserialiseSimpleScript scriptBytes
+      -- deserialize the JSON representation of SimpleScripts..
+      script :: SimpleScript <- fromEitherCli $ Aeson.eitherDecodeStrict' bs
+      let s :: L.NativeScript (Exp.LedgerEra era) = obtainCommonConstraints era $ toAllegraTimelock script
+      return $ obtainCommonConstraints (era :: Exp.Era era) $ Exp.SimpleScript s
+    Right te -> do
+      let scriptBs = teRawCBOR te
+      obtainCommonConstraints era $
+        fromEitherCli $
+          Exp.deserialiseSimpleScript scriptBs
 
 readScriptDataOrFile
   :: MonadIO m