Skip to content

ouroboros-network-0.19.0.3 #6114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

ouroboros-network-0.19.0.3 #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 31 additions & 29 deletions bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/NodeToNode.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions cardano-node/cardano-node.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions cardano-tracer/src/Cardano/Tracer/Acceptors/Client.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cardano-tracer/src/Cardano/Tracer/Acceptors/Server.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
5 changes: 3 additions & 2 deletions cardano-tracer/test/Cardano/Tracer/Test/Forwarder.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions trace-dispatcher/src/Cardano/Logging/Forwarding.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion trace-forward/trace-forward.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading