Propagate flat ADT refactoring to consumers

Update Compatible layer, Transaction/Query/Genesis runners, Byron,
build config, and golden tests to use the new flat script types.

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 2026-02-17T10:15:41Z
-  , cardano-haskell-packages 2026-03-19T11:07:17Z
+  , hackage.haskell.org 2026-02-06T20:27:32Z
+  , cardano-haskell-packages 2026-02-27T19:25:49Z
 
 packages:
   cardano-cli

cardano-cli/cardano-cli.cabal

@@ -242,18 +242,18 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=10.25,
+    cardano-api ^>=10.24,
     cardano-binary,
     cardano-crypto,
-    cardano-crypto-class ^>=2.3,
-    cardano-crypto-wrapper ^>=1.7,
+    cardano-crypto-class ^>=2.2.3.2,
+    cardano-crypto-wrapper ^>=1.6,
     cardano-data >=1.1,
     cardano-git-rev ^>=0.2.2,
     cardano-ledger-api,
     cardano-ledger-conway,
     cardano-ledger-core,
     cardano-ledger-dijkstra,
-    cardano-ping ^>=0.10,
+    cardano-ping ^>=0.9,
     cardano-prelude,
     cardano-protocol-tpraos,
     cardano-slotting ^>=0.2.0.0,
@@ -282,7 +282,8 @@ library
     network-uri,
     optparse-applicative-fork,
     ordered-containers,
-    ouroboros-consensus:{cardano, ouroboros-consensus},
+    ouroboros-consensus,
+    ouroboros-consensus-cardano,
     prettyprinter,
     prettyprinter-ansi-terminal,
     random,
@@ -442,8 +443,10 @@ test-suite cardano-cli-golden
     cardano-cli,
     cardano-cli:cardano-cli-test-lib,
     cardano-crypto-wrapper,
+    cardano-ledger-core,
     cardano-strict-containers ^>=0.1,
     cborg,
+    containers,
     directory,
     exceptions,
     extra,

cardano-cli/src/Cardano/CLI/Byron/Tx.hs

@@ -26,6 +26,7 @@ import Cardano.Api
 import Cardano.Api.Byron qualified as Byron
 import Cardano.Api.Consensus qualified as Byron
 import Cardano.Api.Ledger qualified as L
+import Cardano.Api.Network qualified as Net.Tx
 
 import Cardano.Binary qualified as Binary
 import Cardano.CLI.Byron.Key (byronWitnessToVerKey)
@@ -198,12 +199,11 @@ nodeSubmitTx nodeSocketPath network gentx = do
           }
   res <- liftIO $ submitTxToNodeLocal connctInfo (TxInByronSpecial gentx)
   case res of
-    TxSubmitSuccess -> liftIO $ Text.putStrLn "Transaction successfully submitted."
-    TxSubmitFail reason ->
+    Net.Tx.SubmitSuccess -> liftIO $ Text.putStrLn "Transaction successfully submitted."
+    Net.Tx.SubmitFail reason ->
       case reason of
         TxValidationErrorInCardanoMode err -> left . ByronTxSubmitError . Text.pack $ show err
         TxValidationEraMismatch mismatchErr -> left $ ByronTxSubmitErrorEraMismatch mismatchErr
-    TxSubmitError err -> left . ByronTxSubmitError . Text.pack $ show err
 
   return ()
 

cardano-cli/src/Cardano/CLI/Compatible/Json/Friendly.hs

@@ -284,7 +284,7 @@ getScriptWitnessDetails era tb =
  where
   aeo = convert era
   friendlyRedeemers
-    :: Ledger.Tx C.TopTx (ShelleyLedgerEra era)
+    :: Ledger.Tx (ShelleyLedgerEra era)
     -> Aeson.Value
   friendlyRedeemers tx =
     alonzoEraOnwardsConstraints aeo $ do
@@ -293,7 +293,7 @@ getScriptWitnessDetails era tb =
       Aeson.Array $ Vector.fromList redeemerList
 
   friendlyRedeemerInfo
-    :: Ledger.Tx C.TopTx (ShelleyLedgerEra era)
+    :: Ledger.Tx (ShelleyLedgerEra era)
     -> Ledger.PlutusPurpose Ledger.AsIx (ShelleyLedgerEra era)
     -> (Ledger.Data (ShelleyLedgerEra era), ExUnits)
     -> Aeson.Value
@@ -373,7 +373,7 @@ getScriptWitnessDetails era tb =
   addLabelToPurpose Proposing pp = Aeson.object ["submitting a proposal following proposal policy" .= pp]
   addLabelToPurpose Guarding _ = error "TODO Dijkstra"
 
-  friendlyScriptData :: Ledger.Tx C.TopTx (ShelleyLedgerEra era) -> Aeson.Value
+  friendlyScriptData :: Ledger.Tx (ShelleyLedgerEra era) -> Aeson.Value
   friendlyScriptData tx =
     alonzoEraOnwardsConstraints aeo $ do
       Aeson.Array $
@@ -386,7 +386,7 @@ getScriptWitnessDetails era tb =
           | (scriptHash, scriptData) <- Map.toList $ tx ^. Ledger.witsTxL . Ledger.scriptTxWitsL
           ]
 
-  friendlyDats :: Ledger.Tx C.TopTx (ShelleyLedgerEra era) -> Aeson.Value
+  friendlyDats :: Ledger.Tx (ShelleyLedgerEra era) -> Aeson.Value
   friendlyDats tx =
     alonzoEraOnwardsConstraints aeo $
       let Ledger.TxDats dats = tx ^. Ledger.witsTxL . Ledger.datsTxWitsL
@@ -633,7 +633,7 @@ renderCertificate sbe (Exp.Certificate c) =
 
 renderDrepCredential
   :: ()
-  => L.Credential L.DRepRole
+  => L.Credential 'L.DRepRole
   -> Aeson.Value
 renderDrepCredential =
   object . \case

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

@@ -8,21 +8,23 @@
 {-# LANGUAGE TypeFamilies #-}
 
 module Cardano.CLI.Compatible.Read
-  ( readFilePlutusScript
+  ( AnyPlutusScript (..)
+  , readFilePlutusScript
   , readFileSimpleScript
   )
 where
 
 import Cardano.Api as Api
-import Cardano.Api.Experimental.Plutus qualified as Exp
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.Read (readFileCli)
+import Cardano.CLI.Type.Error.PlutusScriptDecodeError
 import Cardano.CLI.Type.Error.ScriptDecodeError
 
 import Prelude
 
 import Data.Aeson qualified as Aeson
+import Data.Bifunctor
 import Data.ByteString qualified as BS
 import Data.Text qualified as Text
 
@@ -53,21 +55,48 @@ deserialiseSimpleScript bs =
   teType' :: FromSomeType HasTextEnvelope (Script SimpleScript')
   teType' = FromSomeType (AsScript AsSimpleScript) id
 
+data AnyPlutusScript where
+  AnyPlutusScript
+    :: IsPlutusScriptLanguage lang => PlutusScriptVersion lang -> PlutusScript lang -> AnyPlutusScript
+
 readFilePlutusScript
-  :: forall era e
-   . ShelleyBasedEra era
-  -> FilePath
-  -> CIO e (Exp.AnyPlutusScript (ShelleyLedgerEra era))
-readFilePlutusScript sbe plutusScriptFp = do
-  bs <- readFileCli plutusScriptFp
-  te <- fromEitherCli $ deserialiseFromJSON bs
-  let scriptBs = teRawCBOR te
-      TextEnvelopeType anyScriptType = teType te
-  case Exp.textToPlutusLanguage (Text.pack anyScriptType) of
-    Just lang ->
-      fromEitherCli
-        ( shelleyBasedEraConstraints sbe (Exp.decodeAnyPlutusScript scriptBs lang)
-            :: Either DecoderError (Exp.AnyPlutusScript (ShelleyLedgerEra era))
-        )
-    Nothing ->
-      throwCliError $ "Unsupported script language: " <> anyScriptType
+  :: FilePath
+  -> CIO e AnyPlutusScript
+readFilePlutusScript plutusScriptFp = do
+  bs <-
+    readFileCli plutusScriptFp
+  fromEitherCli $ deserialisePlutusScript bs
+
+deserialisePlutusScript
+  :: BS.ByteString
+  -> Either PlutusScriptDecodeError AnyPlutusScript
+deserialisePlutusScript bs = do
+  te <- first PlutusScriptJsonDecodeError $ deserialiseFromJSON bs
+  case teType te of
+    TextEnvelopeType s -> case s of
+      "PlutusScriptV1" -> deserialiseAnyPlutusScriptVersion PlutusScriptV1 te
+      "PlutusScriptV2" -> deserialiseAnyPlutusScriptVersion PlutusScriptV2 te
+      "PlutusScriptV3" -> deserialiseAnyPlutusScriptVersion PlutusScriptV3 te
+      unknownScriptVersion ->
+        Left . PlutusScriptDecodeErrorUnknownVersion $ Text.pack unknownScriptVersion
+ where
+  deserialiseAnyPlutusScriptVersion
+    :: IsPlutusScriptLanguage lang
+    => PlutusScriptVersion lang
+    -> TextEnvelope
+    -> Either PlutusScriptDecodeError AnyPlutusScript
+  deserialiseAnyPlutusScriptVersion lang tEnv =
+    first PlutusScriptDecodeTextEnvelopeError $
+      deserialiseFromTextEnvelopeAnyOf [teTypes (AnyPlutusScriptVersion lang)] tEnv
+
+  teTypes :: AnyPlutusScriptVersion -> FromSomeType HasTextEnvelope AnyPlutusScript
+  teTypes =
+    \case
+      AnyPlutusScriptVersion PlutusScriptV1 ->
+        FromSomeType (AsPlutusScript AsPlutusScriptV1) (AnyPlutusScript PlutusScriptV1)
+      AnyPlutusScriptVersion PlutusScriptV2 ->
+        FromSomeType (AsPlutusScript AsPlutusScriptV2) (AnyPlutusScript PlutusScriptV2)
+      AnyPlutusScriptVersion PlutusScriptV3 ->
+        FromSomeType (AsPlutusScript AsPlutusScriptV3) (AnyPlutusScript PlutusScriptV3)
+      AnyPlutusScriptVersion PlutusScriptV4 ->
+        FromSomeType (AsPlutusScript AsPlutusScriptV4) (AnyPlutusScript PlutusScriptV4)

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

@@ -12,7 +12,6 @@ module Cardano.CLI.Compatible.Transaction.Command
 where
 
 import Cardano.Api
-import Cardano.Api.Experimental
 
 import Cardano.CLI.EraBased.Script.Type
 import Cardano.CLI.Type.Common
@@ -28,15 +27,15 @@ data CompatibleTransactionCmds era
       [TxOutAnyEra]
       !(Maybe (Featured ShelleyToBabbageEra era (Maybe UpdateProposalFile)))
       !( Maybe
-           (Featured ConwayEraOnwards era [(ProposalFile In, Maybe (ScriptRequirements ProposalItem))])
+           (Featured ConwayEraOnwards era [(ProposalFile In, Maybe AnyNonAssetScript)])
        )
-      ![(VoteFile In, Maybe (ScriptRequirements VoterItem))]
+      ![(VoteFile In, Maybe AnyNonAssetScript)]
       [WitnessSigningData]
       -- ^ Signing keys
       (Maybe NetworkId)
       !Coin
       -- ^ Tx fee
-      ![(CertificateFile, Maybe (ScriptRequirements CertItem))]
+      ![(CertificateFile, Maybe AnyNonAssetScript)]
       -- ^ stake registering certs
       !(File () Out)
 

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

@@ -11,7 +11,6 @@ module Cardano.CLI.Compatible.Transaction.Option
 where
 
 import Cardano.Api
-import Cardano.Api.Experimental
 
 import Cardano.CLI.Compatible.Transaction.Command
 import Cardano.CLI.Environment
@@ -161,7 +160,7 @@ pRefScriptFp =
 pVoteFiles
   :: ShelleyBasedEra era
   -> BalanceTxExecUnits
-  -> Parser [(VoteFile In, Maybe (ScriptRequirements VoterItem))]
+  -> Parser [(VoteFile In, Maybe AnyNonAssetScript)]
 pVoteFiles sbe bExUnits =
   caseShelleyToBabbageOrConwayEraOnwards
     (const $ pure [])