Add EraT and CardanoNodeT monad transformers to reduce argument passing.

Author: locallycompact

hydra-chain-observer/src/Hydra/Ouroborus/ChainObserver.hs

@@ -14,6 +14,8 @@ import Hydra.Cardano.Api (
   ChainTip,
   ConsensusModeParams (..),
   EpochSlots (..),
+  Era,
+  IsShelleyBasedEra (shelleyBasedEra),
   LocalChainSyncClient (..),
   LocalNodeClientProtocols (..),
   LocalNodeConnectInfo (..),
@@ -26,7 +28,7 @@ import Hydra.Cardano.Api (
   getTxId,
   pattern Block,
  )
-import Hydra.Chain.CardanoClient (queryTip)
+import Hydra.Chain.CardanoClient (queryTip, runCardanoNode)
 import Hydra.ChainObserver.NodeClient (
   ChainObservation (..),
   ChainObserverLog (..),
@@ -54,7 +56,7 @@ ouroborusClient tracer nodeSocket networkId =
     { follow = \startChainFrom observerHandler -> do
         traceWith tracer ConnectingToNode{nodeSocket, networkId}
         chainPoint <- case startChainFrom of
-          Nothing -> queryTip (connectInfo nodeSocket networkId)
+          Nothing -> runCardanoNode (connectInfo nodeSocket networkId) (shelleyBasedEra @Era) queryTip
           Just x -> pure x
         traceWith tracer StartObservingFrom{chainPoint}
         connectToLocalNode

hydra-cluster/src/Hydra/Generator.hs

@@ -5,7 +5,7 @@ import Hydra.Prelude hiding (size)
 import Test.Hydra.Prelude
 
 import Cardano.Api.UTxO qualified as UTxO
-import CardanoClient (QueryPoint (QueryTip), localNodeConnectInfo, mkGenesisTx, queryUTxOFor)
+import CardanoClient (QueryPoint (QueryTip), localNodeConnectInfo, mkGenesisTx, queryUTxOFor, runCardanoNode)
 import Control.Monad (foldM)
 import Data.Aeson (object, withObject, (.:), (.=))
 import Hydra.Chain.Backend (buildTransaction)
@@ -177,7 +177,9 @@ generateDemoUTxODataset ::
   IO Dataset
 generateDemoUTxODataset network nodeSocket faucetSk nClients nTxs = do
   -- Query available funds
-  faucetUTxO <- queryUTxOFor (localNodeConnectInfo network nodeSocket) QueryTip faucetVk
+  faucetUTxO <-
+    runCardanoNode (localNodeConnectInfo network nodeSocket) shelleyBasedEra $
+      queryUTxOFor QueryTip faucetVk
   let (Coin fundsAvailable) = UTxO.totalLovelace faucetUTxO
   -- Generate client datasets
   allPaymentKeys <- generate $ replicateM nClients genSigningKey