Fetchblock phase 2

Author: carbolymer

cardano-node/src/Cardano/Node/Run.hs

@@ -57,6 +57,7 @@ import           Cardano.Node.Protocol.Types
 import           Cardano.Node.Queries
 import           Cardano.Rpc.Server
 import           Cardano.Rpc.Server.Config
+import           Data.IORef
 import           Cardano.Node.Startup
 import           Cardano.Node.TraceConstraints (TraceConstraints)
 import           Cardano.Node.Tracing.API
@@ -541,6 +542,7 @@ handleSimpleNode blockType runP tracers nc networkMagic onKernel = do
 #endif
     nForkPolicy <- getForkPolicy $ ncResponderCoreAffinityPolicy nc
     cForkPolicy <- getForkPolicy $ ncResponderCoreAffinityPolicy nc
+    nodeAccessRef <- newIORef Nothing
     void $
       let diffusionNodeArguments :: Cardano.Diffusion.CardanoNodeArguments IO
           diffusionNodeArguments = Cardano.Diffusion.CardanoNodeArguments {
@@ -573,7 +575,7 @@ handleSimpleNode blockType runP tracers nc networkMagic onKernel = do
               (readTVar ledgerPeerSnapshotVar)
               nc
       in
-      withAsync (rpcServerLoop (startupTracer tracers) (rpcTracer tracers) rpcConfigVar networkMagic) $ \_ ->
+      withAsync (rpcServerLoop (startupTracer tracers) (rpcTracer tracers) rpcConfigVar networkMagic nodeAccessRef) $ \_ ->
         Node.run
           nodeArgs {
               rnNodeKernelHook = \registry nodeKernel -> do
@@ -858,16 +860,17 @@ rpcServerLoop :: Tracer IO (StartupTrace blk)
               -> Tracer IO TraceRpc
               -> StrictTVar IO RpcConfig
               -> NetworkMagic
+              -> IORef (Maybe (NodeAccess IO))
               -> IO ()
-rpcServerLoop startupTracer rpcTracer rpcConfigVar networkMagic = go
+rpcServerLoop startupTracer rpcTracer rpcConfigVar networkMagic nodeAccessRef = go
   where
     go = do
       config@RpcConfig{isEnabled = Identity enabled} <- readTVarIO rpcConfigVar
       if enabled
         then
           race_
             (do
-              runRpcServer rpcTracer (config, networkMagic)
+              runRpcServer rpcTracer config networkMagic nodeAccessRef
               traceWith startupTracer RpcForceDisabled
               disableRpcServer)
             (waitForRpcConfigChange config)

cardano-submit-api/src/Cardano/TxSubmit/Web.hs

@@ -18,7 +18,7 @@ import           Cardano.Api (AllegraEra, AnyCardanoEra (AnyCardanoEra), AsType
                    LocalNodeConnectInfo (LocalNodeConnectInfo, localConsensusModeParams, localNodeNetworkId, localNodeSocketPath),
                    NetworkId, SerialiseAsCBOR (..), ShelleyBasedEra (..), ShelleyEra, SocketPath,
                    ToJSON, Tx, TxId (..), TxInMode (TxInMode), TxValidationErrorInCardanoMode (..),
-                   getTxBody, getTxId, submitTxToNodeLocal)
+                   getTxId, submitTxToNodeLocal)
 import qualified Cardano.Api
 
 import           Cardano.Binary (DecoderError (..))
@@ -144,7 +144,7 @@ txSubmitPost trace p@(CardanoModeParams cModeParams) networkId socketPath txByte
     case res of
       Cardano.Api.TxSubmitSuccess -> do
         liftIO $ T.putStrLn "Transaction successfully submitted."
-        return $ getTxId (getTxBody tx)
+        let Tx txBody _ = tx in return $ getTxId txBody
       Cardano.Api.TxSubmitFail e ->
         left $ TxCmdTxSubmitValidationError e
       Cardano.Api.TxSubmitError e ->

cardano-testnet/src/Testnet/Process/Cli/DRep.hs

@@ -17,7 +17,7 @@ module Testnet.Process.Cli.DRep
   , makeActivityChangeProposal
   ) where
 
-import           Cardano.Api hiding (Certificate, TxBody, txId)
+import           Cardano.Api hiding (TxBody, txId)
 import           Cardano.Api.Experimental (Some (..))
 import           Cardano.Api.Ledger (EpochInterval (EpochInterval, unEpochInterval))
 

cardano-testnet/src/Testnet/Process/Cli/Transaction.hs

@@ -17,7 +17,7 @@ module Testnet.Process.Cli.Transaction
   )
 where
 
-import           Cardano.Api hiding (Certificate, TxBody)
+import           Cardano.Api hiding (TxBody)
 import           Cardano.Api.Experimental (Some (..))
 
 import           Prelude