Merge pull request #1675 from Plutonomicon/blockfrost-provider-extraction

Extract blockfrost provider

Author: errfrom

CHANGELOG.md

@@ -105,6 +105,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Ignore **any** tx evaluation errors if tx marked invalid. Previously, certain internal evaluation errors were not properly handled, leading to unexpected behavior for a subset of explicitly marked "invalid" transactions. ([#1668](https://github.com/Plutonomicon/cardano-transaction-lib/pull/1668))
 - `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))
 
 ### Fixed
 

packages.dhall

@@ -1,5 +1,5 @@
 let upstream =
     -- https://github.com/mlabs-haskell/purescript-cardano-package-set
-      https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v1.1.0/packages.dhall sha256:6197d808325030415858c597b61c83320344bf899107b83f7dfe366de4650aa6
+      https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v1.2.0/packages.dhall sha256:1879aeee12ef41d5f39ed8b530efa817c747366553b2fc90981ad4e8c21fc5d8
 
 in  upstream

spago-packages.nix

@@ -11,7 +11,6 @@
   , "arrays"
   , "avar"
   , "bifunctors"
-  , "bignumber"
   , "bytearrays"
   , "cardano-hd-wallet"
   , "cardano-key-wallet"
@@ -20,6 +19,7 @@
   , "cardano-serialization-lib"
   , "cardano-transaction-builder"
   , "cardano-types"
+  , "cardano-blockfrost-provider"
   , "cardano-provider"
   , "checked-exceptions"
   , "cip30"
@@ -41,7 +41,6 @@
   , "foreign-object"
   , "formatters"
   , "functions"
-  , "heterogeneous"
   , "http-methods"
   , "identity"
   , "integers"
@@ -51,7 +50,6 @@
   , "lists"
   , "literals"
   , "maybe"
-  , "media-types"
   , "monad-logger"
   , "mote"
   , "mote-testplan"
@@ -84,7 +82,6 @@
   , "quickcheck"
   , "quickcheck-combinators"
   , "random"
-  , "rationals"
   , "record"
   , "refs"
   , "safe-coerce"

spago.dhall

@@ -3,7 +3,7 @@ module Contract.Numeric.Rational
   ( module Rational
   ) where
 
-import Ctl.Internal.Types.Rational
+import Cardano.Types.Rational
   ( class RationalComponent
   , Rational
   , denominator

src/Contract/Numeric/Rational.purs

@@ -2,9 +2,9 @@ module Contract.ProtocolParameters
   ( getProtocolParameters
   ) where
 
+import Cardano.Types.ProtocolParameters (ProtocolParameters)
 import Contract.Monad (Contract)
 import Ctl.Internal.Contract (getProtocolParameters) as Contract
-import Ctl.Internal.Types.ProtocolParameters (ProtocolParameters)
 
 -- | Returns the `ProtocolParameters` from the `Contract` environment.
 -- | Note that this is not necessarily the current value from the ledger.

src/Contract/ProtocolParameters.purs

@@ -33,6 +33,8 @@ import Cardano.Types.EraSummaries
   , SlotLength(SlotLength)
   ) as ExportEraSummaries
 import Cardano.Types.EraSummaries (EraSummaries, EraSummary)
+import Cardano.Types.SystemStart (SystemStart)
+import Cardano.Types.SystemStart (SystemStart(SystemStart)) as ExportSystemStart
 import Contract.Chain (getTip) as Chain
 import Contract.Log (logInfo')
 import Contract.Monad (Contract, liftContractM, liftedE)
@@ -97,8 +99,6 @@ import Ctl.Internal.Types.Interval
   , toOnchainPosixTimeRange
   , upperBound
   ) as Interval
-import Ctl.Internal.Types.SystemStart (SystemStart)
-import Ctl.Internal.Types.SystemStart (SystemStart(SystemStart)) as ExportSystemStart
 import Data.Array as Array
 import Data.Foldable (find)
 import Data.Maybe (Maybe(Just, Nothing))

src/Contract/Time.purs

@@ -41,6 +41,9 @@ import Cardano.Types.Address (Address)
 import Cardano.Types.BigNum as BigNum
 import Cardano.Types.Coin as Coin
 import Cardano.Types.OutputDatum (OutputDatum(OutputDatum))
+import Cardano.Types.ProtocolParameters
+  ( ProtocolParameters(ProtocolParameters)
+  )
 import Cardano.Types.TransactionBody (_votingProposals)
 import Cardano.Types.TransactionInput (TransactionInput)
 import Cardano.Types.TransactionUnspentOutput as TransactionUnspentOutputs
@@ -117,9 +120,6 @@ import Ctl.Internal.Partition
   , equipartitionValueWithTokenQuantityUpperBound
   , partition
   )
-import Ctl.Internal.Types.ProtocolParameters
-  ( ProtocolParameters(ProtocolParameters)
-  )
 import Ctl.Internal.Types.Val (Val(Val), pprintVal)
 import Ctl.Internal.Types.Val as Val
 import Data.Array as Array

src/Internal/BalanceTx/BalanceTx.purs

@@ -3,9 +3,9 @@ module Ctl.Internal.Contract (getChainTip, getProtocolParameters) where
 import Prelude
 
 import Cardano.Types.Chain (Tip)
+import Cardano.Types.ProtocolParameters (ProtocolParameters)
 import Control.Monad.Reader.Class (asks)
 import Ctl.Internal.Contract.Monad (Contract, getProvider)
-import Ctl.Internal.Types.ProtocolParameters (ProtocolParameters)
 import Data.Either (either)
 import Effect.Aff.Class (liftAff)
 import Effect.Class (liftEffect)

src/Internal/Contract.purs

@@ -22,9 +22,16 @@ module Ctl.Internal.Contract.Monad
 
 import Prelude
 
+import Cardano.Blockfrost.Service
+  ( BlockfrostServiceM
+  , runBlockfrostServiceM
+  )
+import Cardano.Blockfrost.Service as Blockfrost
 import Cardano.Provider.Error (ClientError)
 import Cardano.Provider.Type (Provider)
 import Cardano.Types (NetworkId(TestnetId, MainnetId), TransactionHash, UtxoMap)
+import Cardano.Types.ProtocolParameters (ProtocolParameters)
+import Cardano.Types.SystemStart (SystemStart)
 import Contract.Prelude (liftEither)
 import Control.Alt (class Alt)
 import Control.Alternative (class Alternative)
@@ -61,13 +68,6 @@ import Ctl.Internal.QueryM.Ogmios.Types
   ( OgmiosDecodeError
   , pprintOgmiosDecodeError
   )
-import Ctl.Internal.Service.Blockfrost
-  ( BlockfrostServiceM
-  , runBlockfrostServiceM
-  )
-import Ctl.Internal.Service.Blockfrost as Blockfrost
-import Ctl.Internal.Types.ProtocolParameters (ProtocolParameters)
-import Ctl.Internal.Types.SystemStart (SystemStart)
 import Ctl.Internal.Types.UsedTxOuts (UsedTxOuts, isTxOutRefUsed, newUsedTxOuts)
 import Ctl.Internal.Wallet (Wallet(GenericCip30))
 import Ctl.Internal.Wallet.Spec (WalletSpec, mkWalletBySpec)