Skip to content

Commit

Permalink
cardano-api: 10.1 -> 10.4 (#1760)
Browse files Browse the repository at this point in the history
<!-- Describe your change here -->

---

<!-- Consider each and tick it off one way or the other -->
* [ ] CHANGELOG updated or not needed
* [ ] Documentation updated or not needed
* [ ] Haddocks updated or not needed
* [ ] No new TODOs introduced or explained herafter
  • Loading branch information
locallycompact authored Jan 2, 2025
2 parents c3fe7c1 + 9329c74 commit e51a0d9
Show file tree
Hide file tree
Showing 30 changed files with 144 additions and 197 deletions.
4 changes: 2 additions & 2 deletions cabal.project
Original file line number Diff line number Diff line change
Expand Up @@ -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 2024-11-12T16:26:18Z
, cardano-haskell-packages 2024-11-12T08:40:13Z
, hackage.haskell.org 2024-11-22T14:59:16Z
, cardano-haskell-packages 2024-12-05T13:51:16Z

packages:
hydra-prelude
Expand Down
98 changes: 49 additions & 49 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions hydra-cardano-api/hydra-cardano-api.cabal
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ library
Hydra.Cardano.Api.BlockHeader
Hydra.Cardano.Api.ChainPoint
Hydra.Cardano.Api.CtxTx
Hydra.Cardano.Api.CtxUTxO
Hydra.Cardano.Api.ExecutionUnits
Hydra.Cardano.Api.Hash
Hydra.Cardano.Api.Network
Expand Down Expand Up @@ -79,7 +78,7 @@ library
, aeson >=2
, base >=4.16
, bytestring
, cardano-api ^>=10.1
, cardano-api ^>=10.4
, cardano-binary
, cardano-crypto-class
, cardano-ledger-allegra
Expand Down
26 changes: 10 additions & 16 deletions hydra-cardano-api/src/Hydra/Cardano/Api.hs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ import Cardano.Api as X hiding (
fromLedgerValue,
green,
makeShelleyKeyWitness,
policyId,
queryEraHistory,
queryProtocolParameters,
queryStakePools,
Expand Down Expand Up @@ -127,7 +126,6 @@ import Hydra.Cardano.Api.AddressInEra as Extras
import Hydra.Cardano.Api.BlockHeader as Extras
import Hydra.Cardano.Api.ChainPoint as Extras
import Hydra.Cardano.Api.CtxTx as Extras
import Hydra.Cardano.Api.CtxUTxO as Extras
import Hydra.Cardano.Api.ExecutionUnits as Extras
import Hydra.Cardano.Api.Hash as Extras
import Hydra.Cardano.Api.NetworkId ()
Expand Down Expand Up @@ -202,7 +200,7 @@ pattern ShelleyAddressInAnyEra <-
type BalancedTxBody = Cardano.Api.BalancedTxBody Era
{-# COMPLETE BalancedTxBody #-}

pattern BalancedTxBody :: TxBodyContent BuildTx -> UnsignedTx Era -> TxOut CtxTx -> Coin -> BalancedTxBody
pattern BalancedTxBody :: TxBodyContent BuildTx -> TxBody -> TxOut CtxTx -> Coin -> BalancedTxBody
pattern BalancedTxBody{balancedTxBodyContent, balancedTxBody, balancedTxChangeOutput, balancedTxFee} <-
Cardano.Api.BalancedTxBody balancedTxBodyContent balancedTxBody balancedTxChangeOutput balancedTxFee
where
Expand Down Expand Up @@ -392,7 +390,6 @@ pattern TxBodyContent ::
TxValidityUpperBound ->
TxMetadataInEra ->
TxAuxScripts ->
BuildTxWith buidl (TxSupplementalDatums Era) ->
TxExtraKeyWitnesses ->
BuildTxWith buidl (Maybe (LedgerProtocolParameters Era)) ->
TxWithdrawals buidl Era ->
Expand All @@ -417,7 +414,6 @@ pattern TxBodyContent
, txValidityUpperBound
, txMetadata
, txAuxScripts
, txSupplementalDatums
, txExtraKeyWits
, txProtocolParams
, txWithdrawals
Expand All @@ -442,7 +438,6 @@ pattern TxBodyContent
txValidityUpperBound
txMetadata
txAuxScripts
txSupplementalDatums
txExtraKeyWits
txProtocolParams
txWithdrawals
Expand Down Expand Up @@ -583,11 +578,10 @@ pattern TxMintValueNone <-
Cardano.Api.TxMintNone

pattern TxMintValue ::
Value ->
BuildTxWith buidl (Map PolicyId (ScriptWitness WitCtxMint)) ->
Map PolicyId [(AssetName, Quantity, BuildTxWith buidl (ScriptWitness WitCtxMint))] ->
TxMintValue buidl
pattern TxMintValue{txMintValueInEra, txMintValueScriptWitnesses} <-
Cardano.Api.TxMintValue _ txMintValueInEra txMintValueScriptWitnesses
pattern TxMintValue{txMintValueInEra} <-
Cardano.Api.TxMintValue _ txMintValueInEra
where
TxMintValue =
Cardano.Api.TxMintValue maryBasedEra
Expand Down Expand Up @@ -637,7 +631,7 @@ pattern ReferenceScriptNone <-
-- ** TxOutDatum

type TxOutDatum ctx = Cardano.Api.TxOutDatum ctx Era
{-# COMPLETE TxOutDatumNone, TxOutDatumHash, TxOutDatumInTx, TxOutDatumInline #-}
{-# COMPLETE TxOutDatumNone, TxOutDatumHash, TxOutSupplementalDatum, TxOutDatumInline #-}

pattern TxOutDatumNone :: TxOutDatum ctx
pattern TxOutDatumNone <-
Expand All @@ -653,12 +647,12 @@ pattern TxOutDatumHash{txOutDatumHash} <-
TxOutDatumHash =
Cardano.Api.TxOutDatumHash alonzoBasedEra

pattern TxOutDatumInTx :: HashableScriptData -> TxOutDatum CtxTx
pattern TxOutDatumInTx{txOutDatumScriptData} <-
Cardano.Api.TxOutDatumInTx _ txOutDatumScriptData
pattern TxOutSupplementalDatum :: HashableScriptData -> TxOutDatum CtxTx
pattern TxOutSupplementalDatum{txOutDatumScriptData} <-
Cardano.Api.TxOutSupplementalDatum _ txOutDatumScriptData
where
TxOutDatumInTx =
Cardano.Api.TxOutDatumInTx alonzoBasedEra
TxOutSupplementalDatum =
Cardano.Api.TxOutSupplementalDatum alonzoBasedEra

pattern TxOutDatumInline :: HashableScriptData -> TxOutDatum ctx
pattern TxOutDatumInline{txOutDatumInlineScriptData} <-
Expand Down
20 changes: 0 additions & 20 deletions hydra-cardano-api/src/Hydra/Cardano/Api/CtxUTxO.hs

This file was deleted.

Loading

0 comments on commit e51a0d9

Please sign in to comment.