Misc changes

IntersectMBO · Sep 17, 2024 · 9e412ac · 9e412ac
1 parent f4942ca
commit 9e412ac
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs b/cardano-api/gen/Test/Gen/Cardano/Api/Typed.hs
@@ -696,6 +696,7 @@ genTxBodyContent sbe = do
       , Api.txValidityUpperBound
       , Api.txMetadata
       , Api.txAuxScripts
+      , Api.txSupplementalData = Api.BuildTxWith Api.TxSupplementalDataNone
       , Api.txExtraKeyWits
       , Api.txProtocolParams
       , Api.txWithdrawals

diff --git a/cardano-api/internal/Cardano/Api/Fees.hs b/cardano-api/internal/Cardano/Api/Fees.hs
@@ -1433,6 +1433,7 @@ substituteExecutionUnits
                     _
                     _
                     _
+                    _
                     txWithdrawals
                     txCertificates
                     _

diff --git a/cardano-api/internal/Cardano/Api/Tx/Body.hs b/cardano-api/internal/Cardano/Api/Tx/Body.hs
@@ -1376,7 +1376,7 @@ data TxBodyContent build era
   , txValidityUpperBound :: TxValidityUpperBound era
   , txMetadata :: TxMetadataInEra era
   , txAuxScripts :: TxAuxScripts era
-  , txSupplementalData :: TxSupplementalDatums era
+  , txSupplementalData :: BuildTxWith build (TxSupplementalDatums era)
   , txExtraKeyWits :: TxExtraKeyWitnesses era
   , txProtocolParams :: BuildTxWith build (Maybe (LedgerProtocolParameters era))
   , txWithdrawals :: TxWithdrawals build era
@@ -1408,7 +1408,7 @@ defaultTxBodyContent era =
     , txFee = defaultTxFee era
     , txValidityLowerBound = TxValidityNoLowerBound
     , txValidityUpperBound = defaultTxValidityUpperBound era
-    , txSupplementalData = TxSupplementalDataNone
+    , txSupplementalData = BuildTxWith TxSupplementalDataNone
     , txMetadata = TxMetadataNone
     , txAuxScripts = TxAuxScriptsNone
     , txExtraKeyWits = TxExtraKeyWitnessesNone
@@ -1917,6 +1917,7 @@ fromLedgerTxBody sbe scriptValidity body scriptdata mAux =
     , txMintValue = fromLedgerTxMintValue sbe body
     , txExtraKeyWits = fromLedgerTxExtraKeyWitnesses sbe body
     , txProtocolParams = ViewTx
+    , txSupplementalData = ViewTx
     , txMetadata
     , txAuxScripts
     , txScriptValidity = scriptValidity
@@ -2438,9 +2439,9 @@ convScriptData
   => ShelleyBasedEra era
   -> [TxOut CtxTx era]
   -> [(ScriptWitnessIndex, AnyScriptWitness era)]
-  -> TxSupplementalData era
+  -> BuildTxWith BuildTx (TxSupplementalDatums era)
   -> TxBodyScriptData era
-convScriptData sbe txOuts scriptWitnesses txSuppDatums =
+convScriptData sbe txOuts scriptWitnesses (BuildTxWith txSuppDatums) =
   caseShelleyToMaryOrAlonzoEraOnwards
     (const TxBodyNoScriptData)
     ( \w ->
@@ -3386,14 +3387,14 @@ fromShelleyWithdrawal (L.Withdrawals withdrawals) =
 
 convSupplementalDatums
   :: ShelleyBasedEra era
-  -> TxSupplementalData era
+  -> TxSupplementalDatums era
   -> L.TxDats (ShelleyLedgerEra era)
 convSupplementalDatums sbe TxSupplementalDataNone =
   shelleyBasedEraConstraints sbe mempty
-convSupplementalDatums sbe (TxSupplementalData datums) =
+convSupplementalDatums sbe (TxSupplementalDatums datums) =
   shelleyBasedEraConstraints sbe $
     L.TxDats $
-      Map.fromList
+      fromList
         [ (L.hashData d, d)
         | d <- map toAlonzoData datums
         ]

diff --git a/cardano-api/src/Cardano/Api.hs b/cardano-api/src/Cardano/Api.hs
@@ -356,6 +356,7 @@ module Cardano.Api
   , EpochSlots (..)
   , TxMetadataInEra (..)
   , TxAuxScripts (..)
+  , TxSupplementalDatums (..)
   , TxExtraKeyWitnesses (..)
   , TxWithdrawals (..)
   , TxCertificates (..)