Misc changes

IntersectMBO · Sep 16, 2024 · 1eb7b6d · 1eb7b6d
1 parent d5c9ac7
commit 1eb7b6d
Show file tree

Hide file tree

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

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 :: TxSupplementalData era
+  , txSupplementalData :: BuildTxWith build (TxSupplementalData 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,7 +1917,7 @@ fromLedgerTxBody sbe scriptValidity body scriptdata mAux =
     , txMintValue = fromLedgerTxMintValue sbe body
     , txExtraKeyWits = fromLedgerTxExtraKeyWitnesses sbe body
     , txProtocolParams = ViewTx
-    , txSupplementalData = error "ViewTx" -- TODO: Supplementary datums = All datums - redeemers pointing to datums
+    , txSupplementalData = ViewTx
     , txMetadata
     , txAuxScripts
     , txScriptValidity = scriptValidity
@@ -2439,9 +2439,9 @@ convScriptData
   => ShelleyBasedEra era
   -> [TxOut CtxTx era]
   -> [(ScriptWitnessIndex, AnyScriptWitness era)]
-  -> TxSupplementalData era
+  -> BuildTxWith BuildTx (TxSupplementalData era)
   -> TxBodyScriptData era
-convScriptData sbe txOuts scriptWitnesses txSuppDatums =
+convScriptData sbe txOuts scriptWitnesses (BuildTxWith txSuppDatums) =
   caseShelleyToMaryOrAlonzoEraOnwards
     (const TxBodyNoScriptData)
     ( \w ->