Merge pull request #1379 from IntersectMBO/jordan/bump-cardano-api-11.2.0.0

Bump to cardano-api 11.2.0.0 + migrate to Certificate API

Author: Jimbo4350

.changes/20260521_cardano_cli_bump_cardano_api_11_2_0_0.yml

@@ -0,0 +1,17 @@
+project: cardano-cli
+pr: 1379
+kind:
+  - maintenance
+description: |
+  Bump to cardano-api 11.2.0.0. Folds in three migrations that previously
+  lived in separate PRs / unreleased branches:
+
+  - Companion to cardano-api #1200: drop deprecated TxBody / TxBodyContent
+    uses (was #1375).
+  - Companion to cardano-api #1209: migrate createCompatibleTx, toTxOutInEra,
+    and toTxOutInShelleyBasedEra to the experimental TxOut plus supplemental
+    datum map (was #1376).
+  - Companion to cardano-api #1210: legacy Cardano.Api.Certificate module is
+    gone; migrate all imports to Cardano.Api.Experimental.Certificate /
+    Cardano.Api.Compatible.Certificate as appropriate, and drop vacuous
+    hiding clauses that became -Wdodgy-imports errors under -Werror.

.changes/20260521_cardano_cli_fix_inline_datum_tx_view.yml

@@ -0,0 +1,10 @@
+project: cardano-cli
+pr: 1379
+kind:
+  - bugfix
+description: |
+  Fix `cardano-cli transaction view` rendering inline datums as a Haskell-`Show`
+  string instead of the structured JSON detailed-schema dict. The friendly tx
+  renderer's `L.Datum` branch in `friendlyTxOut` now routes through
+  `scriptDataToJson ScriptDataJsonDetailedSchema . fromAlonzoData`, restoring the
+  pre-#1374 output shape for inline-datum outputs.

cabal.project

@@ -14,7 +14,7 @@ repository cardano-haskell-packages
 -- you need to run if you change them
 index-state:
   , hackage.haskell.org 2026-04-16T00:15:23Z
-  , cardano-haskell-packages 2026-05-08T13:26:45Z
+  , cardano-haskell-packages 2026-05-18T18:23:40Z
 
 active-repositories:
   , :rest

cardano-cli/cardano-cli.cabal

@@ -242,7 +242,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=11.1,
+    cardano-api ^>=11.2,
     cardano-binary,
     cardano-crypto,
     cardano-crypto-class ^>=2.3,

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

@@ -8,6 +8,7 @@ module Cardano.CLI.Compatible.Governance.Command
 where
 
 import Cardano.Api
+import Cardano.Api.Compatible.Certificate (MIRPot)
 
 import Cardano.CLI.Compatible.Governance.Types
 import Cardano.CLI.EraBased.Governance.Option

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

@@ -33,6 +33,7 @@ where
 import Cardano.Api as Api
 import Cardano.Api.Experimental (obtainCommonConstraints)
 import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Experimental.Tx qualified as Exp
 import Cardano.Api.Ledger (ExUnits (..), extractHash, strictMaybeToMaybe)
 import Cardano.Api.Ledger qualified as Alonzo
 import Cardano.Api.Ledger qualified as L
@@ -219,8 +220,7 @@ basePairs
   -> [Aeson.Pair]
 basePairs era body mAuxData =
   Exp.obtainCommonConstraints era $
-    let sbe = convert era :: ShelleyBasedEra era
-        certs = toList (body ^. L.certsTxBodyL)
+    let certs = toList (body ^. L.certsTxBodyL)
      in [ "auxiliary scripts" .= friendlyAuxScripts era mAuxData
         , "certificates"
             .= if null certs
@@ -232,7 +232,7 @@ basePairs era body mAuxData =
         , "metadata" .= friendlyMetadata mAuxData
         , "outputs"
             .= map
-              (friendlyTxOut era . fromCtxUTxOTxOut . fromShelleyTxOut sbe)
+              (friendlyTxOut era . Exp.TxOut)
               (toList (body ^. L.outputsTxBodyL))
         , "withdrawals" .= friendlyWithdrawals (body ^. L.withdrawalsTxBodyL)
         ]
@@ -472,8 +472,7 @@ friendlyReturnCollateral era = \case
   L.SNothing -> Aeson.Null
   L.SJust collOut ->
     Exp.obtainCommonConstraints era $
-      let sbe = convert era :: ShelleyBasedEra era
-       in friendlyTxOut era (fromCtxUTxOTxOut (fromShelleyTxOut sbe collOut))
+      friendlyTxOut era (Exp.TxOut collOut)
 
 friendlyExtraKeyWits :: Set.Set (L.KeyHash L.Guard) -> Aeson.Value
 friendlyExtraKeyWits keyhashes
@@ -499,35 +498,45 @@ friendlyStakeAddress (StakeAddress net cred) =
   , friendlyStakeCredential cred
   ]
 
-friendlyTxOut :: Exp.Era era -> TxOut CtxTx era -> Aeson.Value
-friendlyTxOut era (TxOut addr amount mdatum script) =
+friendlyTxOut
+  :: forall era
+   . Exp.Era era
+  -> Exp.TxOut (Exp.LedgerEra era)
+  -> Aeson.Value
+friendlyTxOut era (Exp.TxOut ledgerTxOut) =
   Exp.obtainCommonConstraints era $
-    object $
-      case addr of
-        AddressInEra ByronAddressInAnyEra byronAdr ->
-          [ "address era" .= String "Byron"
-          , "address" .= serialiseAddress byronAdr
-          , "amount" .= friendlyTxOutValue era amount
-          ]
-        AddressInEra (ShelleyAddressInEra _) saddr@(ShelleyAddress net cred stake) ->
-          let preAlonzo =
+    babbageEraOnwardsConstraints beo $
+      let addr = fromShelleyAddr sbe (ledgerTxOut ^. L.addrTxOutL)
+          ledgerValue = ledgerTxOut ^. L.valueTxOutL
+          refScript = case ledgerTxOut ^. L.referenceScriptTxOutL of
+            L.SNothing -> ReferenceScriptNone
+            L.SJust s -> fromShelleyScriptToReferenceScript sbe s
+       in object $
+            case addr of
+              AddressInEra ByronAddressInAnyEra byronAdr ->
+                [ "address era" .= String "Byron"
+                , "address" .= serialiseAddress byronAdr
+                , "amount" .= friendlyLedgerValue era ledgerValue
+                ]
+              AddressInEra (ShelleyAddressInEra _) saddr@(ShelleyAddress net cred stake) ->
                 friendlyPaymentCredential (fromShelleyPaymentCredential cred)
                   : [ "address era" .= Aeson.String "Shelley"
                     , "network" .= net
                     , "address" .= serialiseAddress saddr
-                    , "amount" .= friendlyTxOutValue era amount
-                    , "stake reference" .= friendlyStakeReference (fromShelleyStakeReference stake)
+                    , "amount" .= friendlyLedgerValue era ledgerValue
+                    , "stake reference"
+                        .= friendlyStakeReference (fromShelleyStakeReference stake)
+                    , "datum" .= case ledgerTxOut ^. L.datumTxOutL of
+                        L.NoDatum -> Aeson.Null
+                        L.DatumHash h -> toJSON h
+                        L.Datum bd ->
+                          scriptDataToJson ScriptDataJsonDetailedSchema $
+                            fromAlonzoData (L.binaryDataToData bd)
+                    , "reference script" .= refScript
                     ]
-              datum = ["datum" .= d | d <- maybeToList $ renderDatum mdatum]
-              sinceAlonzo = ["reference script" .= script]
-           in preAlonzo ++ datum ++ sinceAlonzo
  where
-  renderDatum :: TxOutDatum CtxTx era -> Maybe Aeson.Value
-  renderDatum = \case
-    TxOutDatumNone -> Nothing
-    TxOutDatumHash _ h -> Just $ toJSON h
-    TxOutSupplementalDatum _ sData -> Just $ scriptDataToJson ScriptDataJsonDetailedSchema sData
-    TxOutDatumInline _ sData -> Just $ scriptDataToJson ScriptDataJsonDetailedSchema sData
+  beo = convert era :: BabbageEraOnwards era
+  sbe = convert era :: ShelleyBasedEra era
 
 friendlyStakeReference :: StakeAddressReference -> Aeson.Value
 friendlyStakeReference = \case
@@ -690,12 +699,6 @@ friendlyPaymentCredential = \case
 friendlyLovelace :: Lovelace -> Aeson.Value
 friendlyLovelace value = String $ docToText (pretty value)
 
-friendlyTxOutValue :: Exp.Era era -> TxOutValue era -> Aeson.Value
-friendlyTxOutValue era = \case
-  TxOutValueByron lovelace -> friendlyLovelace lovelace
-  TxOutValueShelleyBased _ v ->
-    Exp.obtainCommonConstraints era $ friendlyLedgerValue era v
-
 friendlyLedgerValue
   :: ()
   => Exp.Era era

cardano-cli/src/Cardano/CLI/Compatible/StakeAddress/Run.hs

@@ -10,7 +10,7 @@ module Cardano.CLI.Compatible.StakeAddress.Run
   )
 where
 
-import Cardano.Api hiding (makeStakeAddressRegistrationCertificate)
+import Cardano.Api
 import Cardano.Api.Compatible.Certificate
 import Cardano.Api.Experimental qualified as Exp
 import Cardano.Api.Ledger qualified as L

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

@@ -10,6 +10,7 @@ module Cardano.CLI.Compatible.StakePool.Command
 where
 
 import Cardano.Api
+import Cardano.Api.Experimental.Certificate (StakePoolMetadataReference, StakePoolRelay)
 
 import Cardano.CLI.Type.Common
 import Cardano.CLI.Type.Key

cardano-cli/src/Cardano/CLI/Compatible/StakePool/Run.hs

@@ -9,9 +9,10 @@ module Cardano.CLI.Compatible.StakePool.Run
   )
 where
 
-import Cardano.Api hiding (makeStakePoolRegistrationCertificate)
+import Cardano.Api
 import Cardano.Api.Compatible.Certificate
 import Cardano.Api.Experimental qualified as Exp
+import Cardano.Api.Experimental.Certificate (StakePoolParameters (..), toShelleyPoolParams)
 
 import Cardano.CLI.Compatible.Exception
 import Cardano.CLI.Compatible.StakePool.Command

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

@@ -38,6 +38,7 @@ import Cardano.CLI.Type.Common
 
 import Control.Monad
 import Data.Map.Ordered.Strict qualified as OMap
+import Data.Map.Strict qualified as Map
 import Lens.Micro
 
 runCompatibleTransactionCmd
@@ -60,7 +61,8 @@ runCompatibleTransactionCmd
     ) = shelleyBasedEraConstraints sbe $ do
     sks <- mapM (fromEitherIOCli . readWitnessSigningData) witnesses
 
-    allOuts <- mapM (toTxOutInAnyEra sbe) outs
+    (allOuts, extraDatumsMapList) <- mapAndUnzipM (toTxOutInAnyEra sbe) outs
+    let extraDatums = Map.unions extraDatumsMapList
 
     certFilesAndMaybeScriptWits <-
       readCertificateScriptWitnesses' sbe certificates
@@ -107,7 +109,7 @@ runCompatibleTransactionCmd
 
     transaction@(ShelleyTx _ ledgerTx) <-
       fromEitherCli $
-        createCompatibleTx sbe ins allOuts fee protocolUpdates votes txCerts
+        createCompatibleTx sbe ins allOuts extraDatums fee protocolUpdates votes txCerts
 
     let txBody = ledgerTx ^. L.bodyTxL