Switch to purescript-cardano-package-set v3.0.0

Author: errfrom

packages.dhall

@@ -1,55 +1,6 @@
 let upstream =
     -- https://github.com/mlabs-haskell/purescript-cardano-package-set
-      https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v2.0.0/packages.dhall
-        sha256:89e383ba2cceff5b668cefae59aae352e60fb28543f9dc3fb198a0231d56d8e0
+      https://raw.githubusercontent.com/mlabs-haskell/purescript-cardano-package-set/v3.0.0/packages.dhall
+        sha256:53f8de47606b6cb349432c2f2f03e656b204ebe132ef2d39d76339d9d97620ee
 
-let additions =
-      { cardano-transaction-balancer =
-        { dependencies =
-          [ "aff"
-          , "ansi"
-          , "arrays"
-          , "bifunctors"
-          , "bytearrays"
-          , "cardano-data-lite"
-          , "cardano-kupmios-provider"
-          , "cardano-provider"
-          , "cardano-transaction-builder"
-          , "cardano-types"
-          , "console"
-          , "effect"
-          , "either"
-          , "exceptions"
-          , "foldable-traversable"
-          , "integers"
-          , "js-bigints"
-          , "js-date"
-          , "lattice"
-          , "lists"
-          , "literals"
-          , "maybe"
-          , "monad-logger"
-          , "newtype"
-          , "ordered-collections"
-          , "parallel"
-          , "partial"
-          , "prelude"
-          , "profunctor"
-          , "profunctor-lenses"
-          , "quickcheck"
-          , "random"
-          , "strings"
-          , "stringutils"
-          , "these"
-          , "transformers"
-          , "tuples"
-          , "uint"
-          , "unsafe-coerce"
-          ]
-        , repo =
-            "https://github.com/mlabs-haskell/purescript-cardano-transaction-balancer"
-        , version = "2762e726922a65c772f6f21d547d6bc8f9859e4e"
-        }
-      }
-
-in (upstream // additions)
+in upstream

src/Internal/Test/E2E/Feedback/Browser.purs

@@ -11,10 +11,10 @@ module Ctl.Internal.Test.E2E.Feedback.Browser
 import Prelude
 
 import Aeson (decodeAeson, encodeAeson, jsonToAeson, stringifyAeson)
-import Cardano.Kupmios.KupmiosM (ClusterSetup)
 import Ctl.Internal.FfiHelpers (MaybeFfiHelper, maybeFfiHelper)
 import Ctl.Internal.Helpers (liftedM)
 import Ctl.Internal.Test.E2E.Feedback (BrowserEvent)
+import Ctl.Internal.Test.E2E.Types (ClusterSetup)
 import Data.Argonaut (Json)
 import Data.Either (hush)
 import Data.Maybe (Maybe)

src/Internal/Test/E2E/Feedback/Node.purs

@@ -11,9 +11,9 @@ module Ctl.Internal.Test.E2E.Feedback.Node
 import Prelude
 
 import Aeson (decodeAeson, encodeAeson, parseJsonStringToAeson, stringifyAeson)
-import Cardano.Kupmios.KupmiosM (ClusterSetup)
 import Ctl.Internal.Helpers (liftEither)
 import Ctl.Internal.Test.E2E.Feedback (BrowserEvent(Failure, Success))
+import Ctl.Internal.Test.E2E.Types (ClusterSetup)
 import Data.Array as Array
 import Data.Either (Either(Left), hush, note)
 import Data.Foldable (and)

src/Internal/Test/E2E/Route.purs

@@ -10,7 +10,6 @@ module Ctl.Internal.Test.E2E.Route
 
 import Prelude
 
-import Cardano.Kupmios.KupmiosM (ClusterSetup)
 import Cardano.Types (NetworkId(TestnetId))
 import Cardano.Types.PrivateKey (PrivateKey)
 import Cardano.Types.PrivateKey as PrivateKey
@@ -31,6 +30,7 @@ import Ctl.Internal.Contract.ProviderBackend (mkCtlBackendParams)
 import Ctl.Internal.Helpers (liftEither)
 import Ctl.Internal.Test.E2E.Feedback.Browser (getClusterSetupRepeatedly)
 import Ctl.Internal.Test.E2E.Feedback.Hooks (addE2EFeedbackHooks)
+import Ctl.Internal.Test.E2E.Types (ClusterSetup)
 import Ctl.Internal.Wallet.Spec (WalletSpec(ConnectToGenericCip30))
 import Data.Array (last)
 import Data.Array as Array

src/Internal/Test/E2E/Runner.purs

@@ -10,7 +10,6 @@ import Prelude
 import Affjax (defaultRequest) as Affjax
 import Affjax (printError)
 import Affjax.ResponseFormat as Affjax.ResponseFormat
-import Cardano.Kupmios.KupmiosM (ClusterSetup)
 import Cardano.Provider.Affjax (request) as Affjax
 import Cardano.Types.BigNum as BigNum
 import Cardano.Types.PrivateKey as PrivateKey
@@ -46,6 +45,7 @@ import Ctl.Internal.Test.E2E.Types
   ( Browser
   , BrowserArg
   , ChromeUserDataDir
+  , ClusterSetup
   , E2ETest
   , E2ETestRuntime
   , E2EWallet(NoWallet, LocalTestnet, WalletExtension)

src/Internal/Test/E2E/Types.purs

@@ -1,6 +1,7 @@
 -- | Common types for E2E tests.
 module Ctl.Internal.Test.E2E.Types
   ( Browser
+  , ClusterSetup
   , TmpDir
   , SettingsArchive
   , SettingsArchiveUrl
@@ -26,6 +27,8 @@ module Ctl.Internal.Test.E2E.Types
 
 import Prelude
 
+import Cardano.Provider (ServerConfig)
+import Cardano.Wallet.Key (PrivatePaymentKey, PrivateStakeKey)
 import Control.Alt ((<|>))
 import Data.Either (hush)
 import Data.Generic.Rep (class Generic)
@@ -172,3 +175,15 @@ type SomeWallet =
   , confirmAccess :: ExtensionId -> RunningE2ETest -> Aff Unit
   , sign :: ExtensionId -> WalletPassword -> RunningE2ETest -> Aff Unit
   }
+
+-- | Cluster setup contains everything that is needed to run a `Contract` on
+-- | a local cluster: parameters to connect to the services and private keys
+-- | that are pre-funded with Ada on that cluster
+type ClusterSetup =
+  { ogmiosConfig :: ServerConfig
+  , kupoConfig :: ServerConfig
+  , keys ::
+      { payment :: PrivatePaymentKey
+      , stake :: Maybe PrivateStakeKey
+      }
+  }

src/Internal/TxOutput.purs

@@ -11,7 +11,7 @@ import Prelude
 
 import Cardano.AsCbor (decodeCbor, encodeCbor)
 import Cardano.Data.Lite (fromBytes, toBytes)
-import Cardano.Provider.TxEvaluation (OgmiosTxOut, OgmiosTxOutRef)
+import Cardano.Provider (OgmiosTxOut, OgmiosTxOutRef)
 import Cardano.Types
   ( DataHash
   , PlutusData

test/Ogmios/Aeson.purs

@@ -16,7 +16,6 @@ import Aeson as Aeson
 import Cardano.Kupmios.Ogmios.Types
   ( class DecodeOgmios
   , OgmiosDecodeError(ErrorResponse)
-  , OgmiosTxEvaluationR
   , SubmitTxR
   , decodeOgmios
   )
@@ -66,7 +65,7 @@ tested =
   , ( "queryLedgerState/rewardAccountSummaries" /\ check
         (Proxy :: _ O.DelegationsAndRewardsR)
     )
-  , ("evaluateTransaction" /\ check (Proxy :: _ OgmiosTxEvaluationR))
+  , ("evaluateTransaction" /\ check (Proxy :: _ O.TxEvaluationR))
   , ("submitTransaction" /\ check (Proxy :: _ SubmitTxR))
   , ("hasTransaction" /\ check (Proxy :: _ Mempool.HasTxR))
   , ("sizeOfMempool" /\ check (Proxy :: _ Mempool.MempoolSizeAndCapacity))

test/Ogmios/EvaluateTx.purs

@@ -4,10 +4,9 @@ import Prelude
 
 import Cardano.Kupmios.Ogmios.Types
   ( OgmiosDecodeError(InvalidRpcResponse)
-  , OgmiosTxEvaluationR
   , decodeOgmios
   )
-import Cardano.Provider.TxEvaluation
+import Cardano.Provider
   ( ExecutionUnits
   , RedeemerPointer
   , TxEvaluationFailure(UnparsedError, ScriptFailures)
@@ -21,7 +20,6 @@ import Data.Argonaut.Decode.Error (JsonDecodeError(TypeMismatch))
 import Data.Either (Either(Left, Right))
 import Data.Map as Map
 import Data.Maybe (fromJust)
-import Data.Newtype (unwrap)
 import Data.Tuple.Nested (type (/\), (/\))
 import Effect.Aff (Aff)
 import Effect.Class (liftEffect)
@@ -42,7 +40,7 @@ suite = do
     group "Decoding EvaluateTx response" do
       test "Successfully decodes a valid response" do
         txEvalR :: Either OgmiosDecodeError TxEvaluationR <-
-          (map (\(r :: OgmiosTxEvaluationR) -> unwrap r) <<< decodeOgmios) <$>
+          decodeOgmios <$>
             liftEffect
               ogmiosEvaluateTxValidRespFixture
         txEvalR `shouldSatisfy` case _ of
@@ -55,8 +53,7 @@ suite = do
         body <- liftEffect ogmiosEvaluateTxInvalidPointerFormatFixture
         let
           (txEvalR :: Either OgmiosDecodeError TxEvaluationR) =
-            (map (\(r :: OgmiosTxEvaluationR) -> unwrap r) <<< decodeOgmios)
-              body
+            decodeOgmios body
         txEvalR `shouldSatisfy` case _ of
           Left (InvalidRpcResponse (TypeMismatch errMsg)) -> errMsg ==
             "Expected redeemer to be one of: (spend|mint|publish|withdraw|vote|propose)"
@@ -65,7 +62,7 @@ suite = do
       test "Successfully decodes a failed execution response (Incompatible era)"
         do
           txEvalR :: Either OgmiosDecodeError TxEvaluationR <-
-            (map (\(r :: OgmiosTxEvaluationR) -> unwrap r) <<< decodeOgmios) <$>
+            decodeOgmios <$>
               liftEffect
                 ogmiosEvaluateTxFailIncompatibleEraFixture
           txEvalR `shouldSatisfy` case _ of
@@ -74,7 +71,7 @@ suite = do
 
       test "Successfully decodes a failed execution response (Script errors)" do
         txEvalR :: Either OgmiosDecodeError TxEvaluationR <-
-          (map (\(r :: OgmiosTxEvaluationR) -> unwrap r) <<< decodeOgmios) <$>
+          decodeOgmios <$>
             liftEffect
               ogmiosEvaluateTxFailScriptErrorsFixture
         txEvalR `shouldSatisfy` case _ of