cardano-api: 8.29.1.0 -> 8.37.0.0

Author: locallycompact

cabal.project

@@ -12,8 +12,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING.md for information about when and how to update these.
 index-state:
-  , hackage.haskell.org 2023-12-06T15:07:04Z
-  , cardano-haskell-packages 2023-12-04T19:04:02Z
+  , hackage.haskell.org 2024-01-02T15:07:04Z
+  , cardano-haskell-packages 2024-01-02T19:04:02Z
 
 packages:
   hydra-prelude

flake.lock

@@ -87,7 +87,7 @@ library
     , base                    >=4.16
     , base16-bytestring
     , bytestring
-    , cardano-api             >=8.29.1   && <8.30
+    , cardano-api             >=8.37.0   && <8.38
     , cardano-binary          >=1.7.0    && <1.8
     , cardano-crypto-class    >=2.1.1    && <2.2
     , cardano-ledger-allegra  >=1.2.1    && <1.3
@@ -96,9 +96,9 @@ library
     , cardano-ledger-babbage  >=1.5      && <1.6
     , cardano-ledger-binary   >=1.2      && <1.3
     , cardano-ledger-byron    >=1.0.0    && <1.1
-    , cardano-ledger-core     >=1.8      && <1.9
-    , cardano-ledger-mary     >=1.3.1    && <1.4
-    , cardano-ledger-shelley  >=1.7      && <1.8
+    , cardano-ledger-core     >=1.9      && <1.10
+    , cardano-ledger-mary     >=1.4      && <1.5
+    , cardano-ledger-shelley  >=1.8      && <1.9
     , containers
     , lens
     , plutus-ledger-api       >=1.15.0.1 && <1.16

hydra-cardano-api/hydra-cardano-api.cabal

@@ -87,35 +87,35 @@ min = UTxO . uncurry Map.singleton . Map.findMin . toMap
 -- * Type Conversions
 
 -- | Transforms a UTxO containing tx outs from any era into Babbage era.
-fromApi :: Cardano.Api.UTxO era -> UTxO
-fromApi (Cardano.Api.UTxO eraUTxO) =
+fromApi :: forall era. ShelleyBasedEra era -> Cardano.Api.UTxO era -> UTxO
+fromApi sbe (Cardano.Api.UTxO eraUTxO) =
   let eraPairs = Map.toList eraUTxO
-      babbagePairs = second coerceOutputToEra <$> eraPairs
+      babbagePairs = second (coerceOutputToEra sbe) <$> eraPairs
    in fromPairs babbagePairs
- where
-  coerceOutputToEra :: TxOut CtxUTxO era -> TxOut CtxUTxO Era
-  coerceOutputToEra (TxOut eraAddress eraValue eraDatum eraRefScript) =
-    TxOut
-      (coerceAddressToEra eraAddress)
-      (coerceValueToEra eraValue)
-      (coerceDatumToEra eraDatum)
-      (coerceRefScriptToEra eraRefScript)
-
-  coerceAddressToEra :: AddressInEra era -> AddressInEra Era
-  coerceAddressToEra (AddressInEra _ eraAddress) = anyAddressInShelleyBasedEra ShelleyBasedEraBabbage (toAddressAny eraAddress)
-
-  coerceValueToEra :: TxOutValue era -> TxOutValue Era
-  coerceValueToEra (TxOutAdaOnly _ eraLovelace) = lovelaceToTxOutValue BabbageEra eraLovelace
-  coerceValueToEra (TxOutValue _ value) = TxOutValue MaryEraOnwardsBabbage value
-
-  coerceDatumToEra :: TxOutDatum CtxUTxO era -> TxOutDatum CtxUTxO Era
-  coerceDatumToEra TxOutDatumNone = TxOutDatumNone
-  coerceDatumToEra (TxOutDatumHash _ hashScriptData) = TxOutDatumHash AlonzoEraOnwardsBabbage hashScriptData
-  coerceDatumToEra (TxOutDatumInline _ hashableScriptData) = TxOutDatumInline BabbageEraOnwardsBabbage hashableScriptData
-
-  coerceRefScriptToEra :: ReferenceScript era -> ReferenceScript Era
-  coerceRefScriptToEra ReferenceScriptNone = ReferenceScriptNone
-  coerceRefScriptToEra (ReferenceScript _ scriptInAnyLang) = ReferenceScript BabbageEraOnwardsBabbage scriptInAnyLang
+
+coerceOutputToEra :: forall era. ShelleyBasedEra era -> TxOut CtxUTxO era -> TxOut CtxUTxO Era
+coerceOutputToEra sbe (TxOut eraAddress eraValue eraDatum eraRefScript) =
+  TxOut
+    (coerceAddressToEra eraAddress)
+    (coerceValueToEra sbe eraValue)
+    (coerceDatumToEra eraDatum)
+    (coerceRefScriptToEra eraRefScript)
+
+coerceAddressToEra :: AddressInEra era -> AddressInEra Era
+coerceAddressToEra (AddressInEra _ eraAddress) = anyAddressInShelleyBasedEra ShelleyBasedEraBabbage (toAddressAny eraAddress)
+
+coerceValueToEra :: forall era. ShelleyBasedEra era -> TxOutValue era -> TxOutValue Era
+coerceValueToEra _ (TxOutValueByron eraLovelace) = lovelaceToTxOutValue shelleyBasedEra eraLovelace
+coerceValueToEra sbe (TxOutValueShelleyBased _ value) = TxOutValueShelleyBased ShelleyBasedEraBabbage (toLedgerValue MaryEraOnwardsBabbage $ fromLedgerValue sbe value)
+
+coerceDatumToEra :: TxOutDatum CtxUTxO era -> TxOutDatum CtxUTxO Era
+coerceDatumToEra TxOutDatumNone = TxOutDatumNone
+coerceDatumToEra (TxOutDatumHash _ hashScriptData) = TxOutDatumHash AlonzoEraOnwardsBabbage hashScriptData
+coerceDatumToEra (TxOutDatumInline _ hashableScriptData) = TxOutDatumInline BabbageEraOnwardsBabbage hashableScriptData
+
+coerceRefScriptToEra :: ReferenceScript era -> ReferenceScript Era
+coerceRefScriptToEra ReferenceScriptNone = ReferenceScriptNone
+coerceRefScriptToEra (ReferenceScript _ scriptInAnyLang) = ReferenceScript BabbageEraOnwardsBabbage scriptInAnyLang
 
 toApi :: UTxO -> Cardano.Api.UTxO Era
 toApi = coerce

hydra-cardano-api/src/Cardano/Api/UTxO.hs

@@ -67,6 +67,7 @@ import Cardano.Api as X hiding (
   Witness (..),
   createAndValidateTransactionBody,
   defaultTxBodyContent,
+  fromLedgerValue,
   makeShelleyKeyWitness,
   policyId,
   queryEraHistory,
@@ -76,6 +77,7 @@ import Cardano.Api as X hiding (
   scriptLanguageSupportedInEra,
   signShelleyTransaction,
   toLedgerUTxO,
+  toLedgerValue,
  )
 import Cardano.Api.Byron as X (
   Address (..),
@@ -94,10 +96,8 @@ import Cardano.Api.Shelley as X (
   VerificationKey (..),
   fromAlonzoCostModels,
   fromAlonzoPrices,
-  fromConsensusPointInMode,
   fromPlutusData,
   toAlonzoPrices,
-  toConsensusPointInMode,
   toPlutusData,
   toShelleyNetwork,
  )
@@ -372,10 +372,10 @@ pattern TxBody{txBodyContent} <-
 {-# COMPLETE TxBody #-}
 
 createAndValidateTransactionBody :: TxBodyContent BuildTx -> Either TxBodyError TxBody
-createAndValidateTransactionBody = Cardano.Api.createAndValidateTransactionBody cardanoEra
+createAndValidateTransactionBody = Cardano.Api.createAndValidateTransactionBody shelleyBasedEra
 
 defaultTxBodyContent :: TxBodyContent BuildTx
-defaultTxBodyContent = Cardano.Api.defaultTxBodyContent cardanoEra
+defaultTxBodyContent = Cardano.Api.defaultTxBodyContent shelleyBasedEra
 
 -- ** TxBodyContent
 
@@ -595,14 +595,14 @@ pattern TxOut :: AddressInEra -> Value -> TxOutDatum ctx -> ReferenceScript -> T
 pattern TxOut{txOutAddress, txOutValue, txOutDatum, txOutReferenceScript} <-
   Cardano.Api.TxOut
     txOutAddress
-    (TxOutValue MaryEraOnwardsBabbage txOutValue)
+    (TxOutValueShelleyBased ShelleyBasedEraBabbage (Extras.fromLedgerValue -> txOutValue))
     txOutDatum
     txOutReferenceScript
   where
     TxOut addr value datum ref =
       Cardano.Api.TxOut
         addr
-        (TxOutValue MaryEraOnwardsBabbage value)
+        (TxOutValueShelleyBased ShelleyBasedEraBabbage (Extras.toLedgerValue value))
         datum
         ref
 

hydra-cardano-api/src/Hydra/Cardano/Api.hs

@@ -2,7 +2,7 @@ module Hydra.Cardano.Api.Hash where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Ledger.Alonzo.TxInfo qualified as Ledger
+import Cardano.Ledger.Alonzo.Plutus.TxInfo qualified as Ledger
 import Cardano.Ledger.Keys qualified as Ledger
 import Cardano.Ledger.SafeHash (unsafeMakeSafeHash)
 import Cardano.Ledger.Shelley.Scripts qualified as Ledger