From ca16fce514c6ba7ed3b6aa3e72ceca70d766296e Mon Sep 17 00:00:00 2001
From: Daniel Firth <daniel.firth@iohk.io>
Date: Mon, 7 Oct 2024 15:36:18 +0000
Subject: [PATCH] Use cardano-api HEAD

---
 cabal.project                                      | 7 +++++++
 hydra-cardano-api/src/Hydra/Cardano/Api.hs         | 8 ++++----
 hydra-cardano-api/src/Hydra/Cardano/Api/Address.hs | 1 -
 hydra-cardano-api/src/Hydra/Cardano/Api/UTxO.hs    | 2 +-
 hydra-node/src/Hydra/Chain/CardanoClient.hs        | 1 +
 hydra-tx/src/Hydra/Ledger/Cardano/Builder.hs       | 1 +
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/cabal.project b/cabal.project
index 8db45489881..446a3da3926 100644
--- a/cabal.project
+++ b/cabal.project
@@ -44,3 +44,10 @@ test-show-details: direct
 
 program-options
   ghc-options: -fwrite-ide-info
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/cardano-api
+  tag: 00f025d1fda127d0f7b2e69227e298199bea1fe1
+  --sha256: sha256-GttvKWo+2SytPW59a1JIYSpdlTr+7mcWvvK+EPAgH/k=
+  subdir: cardano-api
diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs
index fbd78eb78ac..685237a7b8f 100644
--- a/hydra-cardano-api/src/Hydra/Cardano/Api.hs
+++ b/hydra-cardano-api/src/Hydra/Cardano/Api.hs
@@ -68,6 +68,7 @@ import Cardano.Api as X hiding (
   blue,
   createAndValidateTransactionBody,
   defaultTxBodyContent,
+  fromLedgerUTxO,
   fromLedgerValue,
   green,
   makeShelleyKeyWitness,
@@ -83,16 +84,12 @@ import Cardano.Api as X hiding (
   toLedgerValue,
   (<+>),
  )
-import Cardano.Api.Byron as X (
-  Address (..),
- )
 import Cardano.Api.Experimental as X (UnsignedTx (..))
 import Cardano.Api.Ledger as X (
   PParams,
  )
 import Cardano.Api.Shelley as X (
   AcquiringFailure (..),
-  Address (..),
   Hash (HeaderHash),
   Key (..),
   PlutusScriptOrReferenceInput (PScript),
@@ -397,6 +394,7 @@ pattern TxBodyContent ::
   TxValidityUpperBound ->
   TxMetadataInEra ->
   TxAuxScripts ->
+  BuildTxWith buidl (TxSupplementalDatums Era) ->
   TxExtraKeyWitnesses ->
   BuildTxWith buidl (Maybe (LedgerProtocolParameters Era)) ->
   TxWithdrawals buidl Era ->
@@ -421,6 +419,7 @@ pattern TxBodyContent
   , txValidityUpperBound
   , txMetadata
   , txAuxScripts
+  , txSupplementalDatums
   , txExtraKeyWits
   , txProtocolParams
   , txWithdrawals
@@ -445,6 +444,7 @@ pattern TxBodyContent
     txValidityUpperBound
     txMetadata
     txAuxScripts
+    txSupplementalDatums
     txExtraKeyWits
     txProtocolParams
     txWithdrawals
diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/Address.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/Address.hs
index d30a22cf5c4..20b8a367842 100644
--- a/hydra-cardano-api/src/Hydra/Cardano/Api/Address.hs
+++ b/hydra-cardano-api/src/Hydra/Cardano/Api/Address.hs
@@ -4,7 +4,6 @@ module Hydra.Cardano.Api.Address where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Api.Byron (Address (..))
 import Cardano.Binary (unsafeDeserialize')
 import Cardano.Chain.Common qualified as Ledger
 import Data.ByteString qualified as BS
diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/UTxO.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/UTxO.hs
index e8aa66af1b3..d093b6b5ef5 100644
--- a/hydra-cardano-api/src/Hydra/Cardano/Api/UTxO.hs
+++ b/hydra-cardano-api/src/Hydra/Cardano/Api/UTxO.hs
@@ -1,6 +1,6 @@
 module Hydra.Cardano.Api.UTxO where
 
-import Hydra.Cardano.Api.Prelude
+import Hydra.Cardano.Api.Prelude hiding (fromLedgerUTxO)
 import Hydra.Cardano.Api.TxId (toLedgerTxId)
 import Hydra.Cardano.Api.TxIn (fromLedgerTxIn, toLedgerTxIn, txIns')
 import Hydra.Cardano.Api.TxOut (fromLedgerTxOut, toLedgerTxOut)
diff --git a/hydra-node/src/Hydra/Chain/CardanoClient.hs b/hydra-node/src/Hydra/Chain/CardanoClient.hs
index fbf46328e4f..d362c39d673 100644
--- a/hydra-node/src/Hydra/Chain/CardanoClient.hs
+++ b/hydra-node/src/Hydra/Chain/CardanoClient.hs
@@ -132,6 +132,7 @@ buildTransaction networkId socket changeAddress utxoToSpend collateral outs = do
       TxValidityNoUpperBound
       TxMetadataNone
       TxAuxScriptsNone
+      (BuildTxWith TxSupplementalDataNone)
       TxExtraKeyWitnessesNone
       (BuildTxWith $ Just $ LedgerProtocolParameters pparams)
       TxWithdrawalsNone
diff --git a/hydra-tx/src/Hydra/Ledger/Cardano/Builder.hs b/hydra-tx/src/Hydra/Ledger/Cardano/Builder.hs
index 255f2e11056..bd996c69643 100644
--- a/hydra-tx/src/Hydra/Ledger/Cardano/Builder.hs
+++ b/hydra-tx/src/Hydra/Ledger/Cardano/Builder.hs
@@ -65,6 +65,7 @@ emptyTxBody =
     TxValidityNoUpperBound
     TxMetadataNone
     TxAuxScriptsNone
+    (BuildTxWith TxSupplementalDataNone)
     TxExtraKeyWitnessesNone
     (BuildTxWith $ Just $ LedgerProtocolParameters def)
     TxWithdrawalsNone