Create an Era-specific wrapper for defaultTxBodyContent

This avoids mentioning "Babbage" in downstream packages like hydra-cluster and will reduce the number of places to switch.
cardano-scaling · Dec 6, 2023 · ccbb69a · ccbb69a
1 parent 67e685a
commit ccbb69a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs
@@ -66,6 +66,7 @@ import Cardano.Api as X hiding (
   UTxO (..),
   Witness (..),
   createAndValidateTransactionBody,
+  defaultTxBodyContent,
   makeShelleyKeyWitness,
   policyId,
   queryEraHistory,
@@ -369,6 +370,9 @@ pattern TxBody{txBodyContent} <-
 createAndValidateTransactionBody :: TxBodyContent BuildTx -> Either TxBodyError TxBody
 createAndValidateTransactionBody = Cardano.Api.createAndValidateTransactionBody cardanoEra
 
+defaultTxBodyContent :: TxBodyContent BuildTx
+defaultTxBodyContent = Cardano.Api.defaultTxBodyContent cardanoEra
+
 -- ** TxBodyContent
 
 type TxBodyContent build = Cardano.Api.TxBodyContent build Era

diff --git a/hydra-cluster/src/CardanoClient.hs b/hydra-cluster/src/CardanoClient.hs
@@ -40,7 +40,7 @@ buildScriptAddress script networkId =
 buildRaw :: [TxIn] -> [TxOut CtxTx] -> Lovelace -> Either TxBodyError TxBody
 buildRaw ins outs fee =
   createAndValidateTransactionBody $
-    defaultTxBodyContent BabbageEra
+    defaultTxBodyContent
       & setTxIns (map (,BuildTxWith $ KeyWitness KeyWitnessForSpending) ins)
       & setTxOuts outs
       & setTxFee (TxFeeExplicit fee)

diff --git a/hydra-test-utils/src/Test/Plutus/Validator.hs b/hydra-test-utils/src/Test/Plutus/Validator.hs
@@ -121,7 +121,7 @@ transactionBodyFromScript validatorScript redeemer =
   body =
     either (error . show) id $
       createAndValidateTransactionBody $
-        defaultTxBodyContent BabbageEra
+        defaultTxBodyContent
           & addTxIn (defaultTxIn, scriptWitness)
           & setTxInsCollateral (TxInsCollateral mempty)
           & setTxProtocolParams (BuildTxWith $ Just $ LedgerProtocolParameters pparams)

diff --git a/hydraw/src/Hydra/Painter.hs b/hydraw/src/Hydra/Painter.hs
@@ -69,7 +69,7 @@ mkPaintTx (txin, txOut) sk Pixel{x, y, red, green, blue} = do
   pure $ signShelleyTransaction ShelleyBasedEraBabbage body [WitnessPaymentKey sk]
  where
   bodyContent =
-    defaultTxBodyContent BabbageEra
+    defaultTxBodyContent
       & addTxIn (txin, BuildTxWith $ KeyWitness KeyWitnessForSpending)
       & addTxOut (toTxContext txOut)
       & setTxFee (TxFeeExplicit $ Lovelace 0)