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

@@ -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

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

@@ -4,8 +4,8 @@ module Hydra.Cardano.Api.PlutusScript where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Ledger.Alonzo.Language qualified as Ledger
 import Cardano.Ledger.Alonzo.Scripts qualified as Ledger
+import Cardano.Ledger.Plutus.Language qualified as Ledger
 import Data.ByteString.Short qualified as SBS
 import PlutusLedgerApi.Common qualified as Plutus
 import Test.QuickCheck (listOf)

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

@@ -4,7 +4,7 @@ module Hydra.Cardano.Api.PolicyId 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.Hashes qualified as Ledger
 import Cardano.Ledger.Mary.Value qualified as Ledger
 import Hydra.Cardano.Api.ScriptHash ()

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

@@ -4,10 +4,9 @@ module Hydra.Cardano.Api.ScriptData where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Api.Byron (TxBody (..))
-import Cardano.Ledger.Alonzo.Scripts.Data qualified as Ledger
 import Cardano.Ledger.Alonzo.TxWits qualified as Ledger
 import Cardano.Ledger.Era qualified as Ledger
+import Cardano.Ledger.Plutus.Data qualified as Ledger
 import Codec.Serialise (deserialiseOrFail, serialise)
 import Control.Arrow (left)
 import Data.Aeson (Value (String), withText)
@@ -55,7 +54,6 @@ lookupScriptData ::
   Tx era ->
   TxOut CtxUTxO era ->
   Maybe HashableScriptData
-lookupScriptData (Tx ByronTxBody{} _) _ = Nothing
 lookupScriptData (Tx (ShelleyTxBody _ _ _ scriptsData _ _) _) (TxOut _ _ datum _) =
   case datum of
     TxOutDatumNone ->

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

@@ -45,14 +45,10 @@ utxoProducedByTx tx =
   TxBody body = getTxBody tx
 
 -- | Get explicit fees allocated to a transaction.
---
--- NOTE: this function is partial and throws if given a Byron transaction for
--- which fees are necessarily implicit.
-txFee' :: HasCallStack => Tx era -> Lovelace
+txFee' :: Tx era -> Lovelace
 txFee' (getTxBody -> TxBody body) =
   case txFee body of
     TxFeeExplicit _ y -> y
-    TxFeeImplicit _ -> error "impossible: TxFeeImplicit on non-Byron transaction."
 
 -- * Type Conversions
 

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

@@ -2,11 +2,11 @@ module Hydra.Cardano.Api.TxBody where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Ledger.Alonzo.Scripts.Data qualified as Ledger
 import Cardano.Ledger.Alonzo.TxWits qualified as Ledger
 import Cardano.Ledger.Babbage.Tx qualified as Ledger
 import Cardano.Ledger.BaseTypes (strictMaybeToMaybe)
 import Cardano.Ledger.Core qualified as Ledger
+import Cardano.Ledger.Plutus.Data qualified as Ledger
 import Data.List (find)
 import Data.Map qualified as Map
 import Hydra.Cardano.Api.PlutusScript (fromLedgerScript)

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

@@ -4,9 +4,9 @@ module Hydra.Cardano.Api.TxIn where
 
 import Hydra.Cardano.Api.Prelude
 
-import Cardano.Ledger.Alonzo.TxInfo qualified as Ledger
 import Cardano.Ledger.BaseTypes qualified as Ledger
 import Cardano.Ledger.Binary qualified as Ledger
+import Cardano.Ledger.Plutus.TxInfo qualified as Ledger
 import Cardano.Ledger.TxIn qualified as Ledger
 import Data.ByteString qualified as BS
 import Data.Set qualified as Set