diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs index 1b65bec2129..b17e44eefdf 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs @@ -133,38 +133,40 @@ benchmarkConnectTxSubmit EnvConsts { .. } handshakeTracer submissionTracer codec , NtN.peerSharing = ownPeerSharing , NtN.query = False }) $ - mkApp $ - NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters - NtN.NodeToNodeProtocols - { NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> - runPeer - mempty - (cChainSyncCodec myCodecs) - channel - chainSyncPeerNull - , NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> - runPeer - mempty - (cBlockFetchCodec myCodecs) - channel - (blockFetchClientPeer blockFetchClientNull) - , NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel -> - kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel - , NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> - runPeer - submissionTracer - (cTxSubmission2Codec myCodecs) - channel - (txSubmissionClientPeer myTxSubClient) - , NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> + \n2nData -> + mkApp $ + NtN.nodeToNodeProtocols NtN.defaultMiniProtocolParameters + NtN.NodeToNodeProtocols + { NtN.chainSyncProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> runPeer + mempty + (cChainSyncCodec myCodecs) + channel + chainSyncPeerNull + , NtN.blockFetchProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> + runPeer mempty - (cPeerSharingCodec myCodecs) + (cBlockFetchCodec myCodecs) channel - (peerSharingClientPeer peerSharingClientNull) - } - n2nVer - ownPeerSharing + (blockFetchClientPeer blockFetchClientNull) + , NtN.keepAliveProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \ctx channel -> + kaClient n2nVer (remoteAddress $ micConnectionId ctx) channel + , NtN.txSubmissionProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> + runPeer + submissionTracer + (cTxSubmission2Codec myCodecs) + channel + (txSubmissionClientPeer myTxSubClient) + , NtN.peerSharingProtocol = InitiatorProtocolOnly $ MiniProtocolCb $ \_ctx channel -> + runPeer + mempty + (cPeerSharingCodec myCodecs) + channel + (peerSharingClientPeer peerSharingClientNull) + } + n2nVer + n2nData + -- Stolen from: Ouroboros/Consensus/Network/NodeToNode.hs kaClient :: Ord remotePeer diff --git a/cabal.project b/cabal.project index de6488c42c8..0bde016a852 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2025-01-01T23:24:19Z - , cardano-haskell-packages 2025-01-22T16:50:05Z + , cardano-haskell-packages 2025-02-11T19:10:21Z packages: cardano-node diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 68ee7ee961e..1d959de87f3 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -188,10 +188,10 @@ library , optparse-applicative-fork >= 0.18.1 , ouroboros-consensus ^>= 0.22 , ouroboros-consensus-cardano ^>= 0.21 - , ouroboros-consensus-diffusion ^>= 0.19 + , ouroboros-consensus-diffusion ^>= 0.20 , ouroboros-consensus-protocol , ouroboros-network-api ^>= 0.12 - , ouroboros-network ^>= 0.19 + , ouroboros-network ^>= 0.19.0.3 , ouroboros-network-framework , ouroboros-network-protocols ^>= 0.13 , prettyprinter diff --git a/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs b/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs index 505f5373b55..fa6b8014aa0 100644 --- a/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs +++ b/cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs @@ -74,7 +74,7 @@ runAcceptorsClient tracerEnv tracerEnvRTView p (ekgConfig, tfConfig, dpfConfig) , (runDataPointsAcceptorInit tracerEnv dpfConfig errorHandler, 3) ] where - appInitiator protocolsWithNums = + appInitiator protocolsWithNums _ = OuroborosApplication [ MiniProtocol { miniProtocolNum = MiniProtocolNum num @@ -95,10 +95,12 @@ doConnectToForwarder -> LocalAddress -> Word32 -> ProtocolTimeLimits (Handshake ForwardingVersion Term) - -> OuroborosApplication 'Mux.InitiatorMode + -> ( ForwardingVersionData + -> OuroborosApplication 'Mux.InitiatorMode (MinimalInitiatorContext LocalAddress) (ResponderContext LocalAddress) LBS.ByteString IO () Void + ) -> IO () doConnectToForwarder snocket address netMagic timeLimits app = do done <- connectToNode diff --git a/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs b/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs index b44f4f46b7c..fc9385f9377 100644 --- a/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs +++ b/cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs @@ -123,7 +123,7 @@ doListenToForwarder snocket address netMagic timeLimits app = do (simpleSingletonVersions ForwardingV_1 (ForwardingVersionData $ NetworkMagic netMagic) - (SomeResponderApplication app) + (\_ -> SomeResponderApplication app) ) nullErrorPolicies $ \_ serverAsync -> wait serverAsync -- Block until async exception. diff --git a/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs b/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs index fd33054e4cb..2f02ec2604e 100644 --- a/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs +++ b/cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs @@ -190,8 +190,9 @@ doConnectToAcceptor TestSetup{..} snocket muxBearer address timeLimits (ekgConfi forwarderApp :: [(RunMiniProtocol 'Mux.InitiatorMode initCtx respCtx LBS.ByteString IO () Void, Word16)] + -> ForwardingVersionData -> OuroborosApplication 'Mux.InitiatorMode initCtx respCtx LBS.ByteString IO () Void - forwarderApp protocols = + forwarderApp protocols _ = OuroborosApplication [ MiniProtocol { miniProtocolNum = MiniProtocolNum num @@ -239,7 +240,7 @@ doListenToAcceptor TestSetup{..} (simpleSingletonVersions ForwardingV_1 (ForwardingVersionData $ unI tsNetworkMagic) -- Taken from mainnet shelley genesis file. - (SomeResponderApplication $ + (\_ -> SomeResponderApplication $ forwarderApp [ (forwardEKGMetricsResp ekgConfig store, 1) , (forwardTraceObjectsResp tfConfig sink, 2) , (forwardDataPointsResp dpfConfig dpStore, 3) diff --git a/flake.lock b/flake.lock index fbc447f1e58..b4b67c334b8 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1737566866, - "narHash": "sha256-TQbNlisnUz3RoMb/kc+d6FYET7Qbim+mMMJg76TpLC8=", + "lastModified": 1739300826, + "narHash": "sha256-L5qASdb+A/vWX59eXpwyRc/jR4w8oYBTgX5QuB+tR34=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "1206c99a450da9681fbe5c3a403cff58569a2ca8", + "rev": "77d82c377a51baed4b8cb3b6420bf3d206495ccc", "type": "github" }, "original": { diff --git a/trace-dispatcher/src/Cardano/Logging/Forwarding.hs b/trace-dispatcher/src/Cardano/Logging/Forwarding.hs index b1367281f9a..04e181548a2 100644 --- a/trace-dispatcher/src/Cardano/Logging/Forwarding.hs +++ b/trace-dispatcher/src/Cardano/Logging/Forwarding.hs @@ -244,8 +244,9 @@ doConnectToAcceptor magic snocket makeBearer configureSocket address timeLimits ctaHandshakeCallbacks = HandshakeCallbacks acceptableVersion queryVersion } forwarderApp :: [(RunMiniProtocol 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void, Word16)] + -> ForwardingVersionData -> OuroborosApplication 'Mux.InitiatorMode initiatorCtx responderCtx LBS.ByteString IO () Void - forwarderApp protocols = + forwarderApp protocols _ = OuroborosApplication [ MiniProtocol { miniProtocolNum = MiniProtocolNum num @@ -294,7 +295,7 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits (simpleSingletonVersions ForwardingV_1 (ForwardingVersionData magic) - (SomeResponderApplication $ + (SomeResponderApplication . forwarderApp [ (forwardEKGMetricsRespRun, 1) , (forwardTraceObjectsResp tfConfig sink, 2) , (forwardDataPointsResp dpfConfig dpStore, 3) @@ -307,8 +308,9 @@ doListenToAcceptor magic snocket makeBearer configureSocket address timeLimits where forwarderApp :: [(RunMiniProtocol 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void (), Word16)] + -> ForwardingVersionData -> OuroborosApplication 'Mux.ResponderMode initiatorCtx responderCtx LBS.ByteString IO Void () - forwarderApp protocols = + forwarderApp protocols _ = OuroborosApplication [ MiniProtocol { miniProtocolNum = MiniProtocolNum num diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal index bbdfdd61a70..6f211d3bce0 100644 --- a/trace-forward/trace-forward.cabal +++ b/trace-forward/trace-forward.cabal @@ -67,7 +67,7 @@ library , network-mux , ouroboros-network-api , singletons ^>= 3.0 - , ouroboros-network-framework ^>= 0.15 + , ouroboros-network-framework ^>= 0.16 , serialise , stm , text