Use HTTP instead of websocket for Ogmios

Author: marcusbfs

src/Internal/Contract/Monad.purs

@@ -53,18 +53,13 @@ import Ctl.Internal.Contract.QueryHandle
   )
 import Ctl.Internal.Contract.QueryHandle.Type (QueryHandle)
 import Ctl.Internal.Helpers (filterMapWithKeyM, liftM, logWithLevel)
-import Ctl.Internal.JsWebSocket (_wsClose, _wsFinalize)
 import Ctl.Internal.Logging (Logger, mkLogger, setupLogs)
 import Ctl.Internal.QueryM
   ( QueryEnv
   , QueryM
-  , WebSocket
   , getProtocolParametersAff
   , getSystemStartAff
-  , mkOgmiosWebSocketAff
-  , underlyingWebSocket
   )
-import Ctl.Internal.QueryM.Kupo (isTxConfirmedAff)
 import Ctl.Internal.Service.Blockfrost
   ( BlockfrostServiceM
   , runBlockfrostServiceM
@@ -77,16 +72,15 @@ import Ctl.Internal.Types.UsedTxOuts (UsedTxOuts, isTxOutRefUsed, newUsedTxOuts)
 import Ctl.Internal.Wallet (Wallet(GenericCip30))
 import Ctl.Internal.Wallet.Spec (WalletSpec, mkWalletBySpec)
 import Data.Bifunctor (lmap)
-import Data.Either (Either(Left, Right), isRight)
+import Data.Either (Either(Right, Left))
 import Data.Log.Level (LogLevel)
 import Data.Log.Message (Message)
 import Data.Maybe (Maybe(Just, Nothing), fromMaybe)
 import Data.Newtype (class Newtype, unwrap)
 import Data.Set (Set)
 import Data.Set as Set
 import Data.Time.Duration (Milliseconds, Seconds)
-import Data.Traversable (for_, traverse, traverse_)
-import Effect (Effect)
+import Data.Traversable (for_, traverse)
 import Effect.Aff (Aff, ParAff, attempt, error, finally, supervise)
 import Effect.Aff.Class (class MonadAff, liftAff)
 import Effect.Class (class MonadEffect, liftEffect)
@@ -262,21 +256,16 @@ mkContractEnv params = do
     }
 
 buildBackend :: Logger -> QueryBackendParams -> Aff QueryBackend
-buildBackend logger = case _ of
+buildBackend _ = case _ of
   CtlBackendParams ctlParams blockfrostParams ->
     flip CtlBackend blockfrostParams <$> buildCtlBackend ctlParams
   BlockfrostBackendParams blockfrostParams ctlParams ->
     BlockfrostBackend blockfrostParams <$> traverse buildCtlBackend ctlParams
   where
   buildCtlBackend :: CtlBackendParams -> Aff CtlBackend
   buildCtlBackend { ogmiosConfig, kupoConfig } = do
-    let isTxConfirmed = map isRight <<< isTxConfirmedAff kupoConfig
-    ogmiosWs <- mkOgmiosWebSocketAff isTxConfirmed logger ogmiosConfig
     pure
-      { ogmios:
-          { config: ogmiosConfig
-          , ws: ogmiosWs
-          }
+      { ogmiosConfig
       , kupoConfig
       }
 
@@ -290,10 +279,10 @@ getLedgerConstants
   -> QueryBackend
   -> Aff LedgerConstants
 getLedgerConstants params = case _ of
-  CtlBackend { ogmios: { ws } } _ ->
+  CtlBackend _ _ ->
     { pparams: _, systemStart: _ }
-      <$> (unwrap <$> getProtocolParametersAff ws logger)
-      <*> getSystemStartAff ws logger
+      <$> (unwrap <$> getProtocolParametersAff logger)
+      <*> getSystemStartAff logger
   BlockfrostBackend backend _ ->
     runBlockfrostServiceM blockfrostLogger backend $
       { pparams: _, systemStart: _ }
@@ -341,16 +330,9 @@ walletNetworkCheck envNetworkId =
 
 -- | Finalizes a `Contract` environment.
 -- | Closes the connections in `ContractEnv`, effectively making it unusable.
+-- TODO: remove
 stopContractEnv :: ContractEnv -> Aff Unit
-stopContractEnv { backend } =
-  liftEffect $ traverse_ stopCtlRuntime (getCtlBackend backend)
-  where
-  stopCtlRuntime :: CtlBackend -> Effect Unit
-  stopCtlRuntime { ogmios } =
-    stopWebSocket ogmios.ws
-
-  stopWebSocket :: forall (a :: Type). WebSocket a -> Effect Unit
-  stopWebSocket = ((*>) <$> _wsFinalize <*> _wsClose) <<< underlyingWebSocket
+stopContractEnv _ = pure unit
 
 -- | Constructs and finalizes a contract environment that is usable inside a
 -- | bracket callback.
@@ -463,9 +445,6 @@ mkQueryEnv params ctlBackend =
       , customLogger: params.customLogger
       , suppressLogs: params.suppressLogs
       }
-  , runtime:
-      { ogmiosWs: ctlBackend.ogmios.ws
-      }
   }
 
 --------------------------------------------------------------------------------

src/Internal/Contract/QueryBackend.purs

@@ -15,7 +15,6 @@ module Ctl.Internal.Contract.QueryBackend
 
 import Prelude
 
-import Ctl.Internal.QueryM (OgmiosWebSocket)
 import Ctl.Internal.ServerConfig (ServerConfig)
 import Data.Maybe (Maybe(Just, Nothing))
 import Data.Time.Duration (Seconds(Seconds))
@@ -29,10 +28,7 @@ data QueryBackend
   | BlockfrostBackend BlockfrostBackend (Maybe CtlBackend)
 
 type CtlBackend =
-  { ogmios ::
-      { config :: ServerConfig
-      , ws :: OgmiosWebSocket
-      }
+  { ogmiosConfig :: ServerConfig
   , kupoConfig :: ServerConfig
   }