Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
- `Provider` (previously called `QueryHandle`) is extracted to its own package [purescript-cardano-provider](https://github.com/mlabs-haskell/purescript-cardano-provider) using module names in the format `Cardano.Provider.*` ([#1671](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1671))
- Switched from WebSocket to HTTP when interfacing with Ogmios. Note: Mempool functionality still uses WebSocket, as it requires a persistent connection to track state. ([#1575](https://github.com/Plutonomicon/cardano-transaction-lib/issues/1575))
- Blockfrost Provider has been extracted to a separate package [purescript-cardano-blockfrost-provider](https://github.com/mlabs-haskell/purescript-cardano-blockfrost-provider) using module names in the format `Cardano.Blockfrost.*` ([#1661](https://github.com/Plutonomicon/cardano-transaction-lib/issues/1661))
- Kupo + Ogmios Provider has been extracted to a separate package [purescript-cardano-kupmios-provider](https://github.com/mlabs-haskell/purescript-cardano-kupmios-provider) using module names in the format `Cardano.Kupmios.*` ([#1662](https://github.com/Plutonomicon/cardano-transaction-lib/issues/1662))
- Ogmios' mempool functionality has been extracted to a separate package [purescript-cardano-ogmios-mempool](https://github.com/mlabs-haskell/purescript-cardano-ogmios-mempool) using the module `Cardano.Ogmios.Mempool`. To use it, the user must create and manage the websocket connection (see [Test.Ctl.Testnet.Contract.OgmiosMempool](https://github.com/Plutonomicon/cardano-transaction-lib/blob/cd80e31d59b233e48ccb2a0b6635d5d8beb5b160/test/Testnet/Contract/OgmiosMempool.purs))
- Made adjustments to the [E2E testing documentation page](./doc/e2e-testing.md). Updated the [template](./templates/ctl-scaffold) to use the newly introduced `e2eConfigs` helper function that allows to define E2E configurations without unnecessary boilerplate. ([#1674](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1674))

### Removed
Expand Down
3 changes: 2 additions & 1 deletion packages.dhall
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
let upstream =
-- https://github.com/mlabs-haskell/purescript-cardano-package-set
https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v1.2.0/packages.dhall sha256:1879aeee12ef41d5f39ed8b530efa817c747366553b2fc90981ad4e8c21fc5d8
https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v1.3.0/packages.dhall
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please release cardano-kupmios-provider v1.0.0 and cardano-ogmios-mempool v1.0.0. Our package set should contain versioned dependencies

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Addressed in defd32f.

sha256:77865b14fd3b73c97b119cee105b30fa859ee2bc480ca8aa290eea7d1ce00538

in upstream
24 changes: 24 additions & 0 deletions spago-packages.nix

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

4 changes: 2 additions & 2 deletions spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
, "cardano-transaction-builder"
, "cardano-types"
, "cardano-blockfrost-provider"
, "cardano-kupmios-provider"
, "cardano-provider"
, "cardano-ogmios-mempool"
, "checked-exceptions"
, "cip30"
, "cip30-mock"
Expand All @@ -39,7 +41,6 @@
, "foldable-traversable"
, "foreign"
, "foreign-object"
, "formatters"
, "functions"
, "http-methods"
, "identity"
Expand Down Expand Up @@ -99,7 +100,6 @@
, "uint"
, "unfoldable"
, "unsafe-coerce"
, "untagged-union"
, "uplc-apply-args"
, "variant"
, "web-html"
Expand Down
12 changes: 6 additions & 6 deletions src/Contract/Backend/Ogmios.purs
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ module Contract.Backend.Ogmios

import Prelude

import Cardano.Kupmios.Ogmios (submitTxOgmios) as Ogmios
import Cardano.Kupmios.Ogmios.Pools (getPoolParameters) as KupmiosM
import Cardano.Kupmios.Ogmios.Types (SubmitTxR)
import Cardano.Types (PoolParams, PoolPubKeyHash)
import Cardano.Types.CborBytes (CborBytes)
import Cardano.Types.TransactionHash (TransactionHash)
import Contract.Monad (Contract)
import Ctl.Internal.Contract.Monad (wrapQueryM)
import Ctl.Internal.QueryM.Ogmios (submitTxOgmios) as Ogmios
import Ctl.Internal.QueryM.Ogmios.Types (SubmitTxR)
import Ctl.Internal.QueryM.Pools (getPoolParameters) as QueryM
import Ctl.Internal.Contract.Monad (wrapKupmiosM)

-- | **This function can only run with Ogmios backend**
-- |
Expand All @@ -22,8 +22,8 @@ import Ctl.Internal.QueryM.Pools (getPoolParameters) as QueryM
getPoolParameters
:: PoolPubKeyHash
-> Contract PoolParams
getPoolParameters = wrapQueryM <<< QueryM.getPoolParameters
getPoolParameters = wrapKupmiosM <<< KupmiosM.getPoolParameters

-- | Error returning variant
submitTxE :: TransactionHash -> CborBytes -> Contract SubmitTxR
submitTxE txhash cbor = wrapQueryM $ Ogmios.submitTxOgmios txhash cbor
submitTxE txhash cbor = wrapKupmiosM $ Ogmios.submitTxOgmios txhash cbor
200 changes: 0 additions & 200 deletions src/Contract/Backend/Ogmios/Mempool.purs

This file was deleted.

8 changes: 4 additions & 4 deletions src/Contract/Time.purs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@ module Contract.Time

import Prelude

import Cardano.Kupmios.Ogmios.Types
( CurrentEpoch(CurrentEpoch)
, OgmiosEraSummaries(OgmiosEraSummaries)
) as ExportOgmios
import Cardano.Types (BigNum, Epoch(Epoch), Slot)
import Cardano.Types (Slot(Slot)) as X
import Cardano.Types.BigNum as BigNum
Expand Down Expand Up @@ -42,10 +46,6 @@ import Control.Monad.Reader.Class (asks)
import Ctl.Internal.Contract (getChainTip)
import Ctl.Internal.Contract.Monad (getProvider)
import Ctl.Internal.Helpers (liftM)
import Ctl.Internal.QueryM.Ogmios.Types
( CurrentEpoch(CurrentEpoch)
, OgmiosEraSummaries(OgmiosEraSummaries)
) as ExportOgmios
import Ctl.Internal.Types.Interval
( AbsTime(AbsTime)
, Closure
Expand Down
31 changes: 0 additions & 31 deletions src/Internal/Affjax.js

This file was deleted.

Loading