Skip to content

Commit 5bc7cff

Browse files
crocodile-dentistcrocodile-dentist
committed
app: integration
1 parent ff8b255 commit 5bc7cff

File tree

4 files changed

+81
-73
lines changed

4 files changed

+81
-73
lines changed

‎dmq-node/app/Main.hs‎

Lines changed: 60 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
module Main where
66

77
import Control.Monad (void)
8-
import Control.Monad.Class.MonadAsync
98
import Control.Tracer (Tracer (..), nullTracer, traceWith)
109

1110
import Data.Act
@@ -15,7 +14,9 @@ import Data.Void (Void)
1514
import Options.Applicative
1615
import System.Random (newStdGen, split)
1716

17+
import Cardano.Crypto.DSIGN.Class qualified as DSIGN
1818
import Cardano.KESAgent.Protocols.StandardCrypto (StandardCrypto)
19+
import Cardano.Ledger.Hashes
1920

2021
import DMQ.Configuration
2122
import DMQ.Configuration.CLIOptions (parseCLIOptions)
@@ -31,9 +32,11 @@ import DMQ.Tracer
3132

3233
import DMQ.Diffusion.PeerSelection (policy)
3334
import DMQ.NodeToClient.LocalStateQueryClient
35+
import DMQ.Protocol.SigSubmission.Validate
3436
import Ouroboros.Network.Diffusion qualified as Diffusion
3537
import Ouroboros.Network.PeerSelection.PeerSharing.Codec (decodeRemoteAddress,
3638
encodeRemoteAddress)
39+
import Ouroboros.Network.SizeInBytes
3740
import Ouroboros.Network.Snocket
3841
import Ouroboros.Network.TxSubmission.Mempool.Simple qualified as Mempool
3942

@@ -78,50 +81,62 @@ runDMQ commandLineConfig = do
7881
diffusionTracers = dmqDiffusionTracers dmqConfig tracer
7982

8083
Diffusion.withIOManager \iocp -> do
81-
let localSnocket' = localSnocket iocp
84+
let localSnocket' = localSnocket iocp
85+
mkStakePoolMonitor = connectToCardanoNode tracer localSnocket' snocketPath
8286

83-
withNodeKernel @StandardCrypto psRng $ \nodeKernel -> do
87+
withNodeKernel @StandardCrypto psRng mkStakePoolMonitor \nodeKernel -> do
8488
dmqDiffusionConfiguration <- mkDiffusionConfiguration dmqConfig nt
8589

86-
let stakePoolMonitor = connectToCardanoNode tracer localSnocket' snocketPath nodeKernel
87-
88-
withAsync stakePoolMonitor \aid -> do
89-
link aid
90-
let dmqNtNApps =
91-
ntnApps tracer
92-
dmqConfig
93-
nodeKernel
94-
(dmqCodecs
95-
-- TODO: `maxBound :: Cardano.Network.NodeToNode.NodeToNodeVersion`
96-
-- is unsafe here!
97-
(encodeRemoteAddress maxBound)
98-
(decodeRemoteAddress maxBound))
99-
dmqLimitsAndTimeouts
100-
defaultSigDecisionPolicy
101-
dmqNtCApps =
102-
let sigSize _ = 0 -- TODO
103-
maxMsgs = 1000 -- TODO: make this negotiated in the handshake?
104-
mempoolReader = Mempool.getReader sigId sigSize (mempool nodeKernel)
105-
mempoolWriter = Mempool.getWriter sigId (const ()) (\_ _ -> pure True) (mempool nodeKernel)
106-
in NtC.ntcApps mempoolReader mempoolWriter maxMsgs
107-
(NtC.dmqCodecs encodeReject decodeReject)
108-
dmqDiffusionArguments =
109-
diffusionArguments (if handshakeTracer
110-
then WithEventType "Handshake" >$< tracer
111-
else nullTracer)
112-
(if localHandshakeTracer
113-
then WithEventType "Handshake" >$< tracer
114-
else nullTracer)
115-
dmqDiffusionApplications =
116-
diffusionApplications nodeKernel
117-
dmqConfig
118-
dmqDiffusionConfiguration
119-
dmqLimitsAndTimeouts
120-
dmqNtNApps
121-
dmqNtCApps
122-
(policy policyRng)
123-
124-
Diffusion.run dmqDiffusionArguments
125-
diffusionTracers
126-
dmqDiffusionConfiguration
127-
dmqDiffusionApplications
90+
let sigSize :: Sig StandardCrypto -> SizeInBytes
91+
sigSize _ = 0 -- TODO
92+
mempoolReader = Mempool.getReader sigId sigSize (mempool nodeKernel)
93+
dmqNtNApps =
94+
let ntnMempoolWriter = Mempool.writerAdapter $
95+
Mempool.getWriter sigId
96+
(poolValidationCtx $ stakePools nodeKernel)
97+
(validateSig FailDefault (KeyHash . DSIGN.hashVerKeyDSIGN))
98+
SigDuplicate
99+
(mempool nodeKernel)
100+
in ntnApps tracer
101+
dmqConfig
102+
mempoolReader
103+
ntnMempoolWriter
104+
sigSize
105+
nodeKernel
106+
(dmqCodecs
107+
-- TODO: `maxBound :: Cardano.Network.NodeToNode.NodeToNodeVersion`
108+
-- is unsafe here!
109+
(encodeRemoteAddress maxBound)
110+
(decodeRemoteAddress maxBound))
111+
dmqLimitsAndTimeouts
112+
defaultSigDecisionPolicy
113+
dmqNtCApps =
114+
let maxMsgs = 1000 -- TODO: make this negotiated in the handshake?
115+
ntcMempoolWriter =
116+
Mempool.getWriter sigId
117+
(poolValidationCtx $ stakePools nodeKernel)
118+
(validateSig FailSoft (KeyHash . DSIGN.hashVerKeyDSIGN))
119+
SigDuplicate
120+
(mempool nodeKernel)
121+
in NtC.ntcApps mempoolReader ntcMempoolWriter maxMsgs
122+
(NtC.dmqCodecs encodeReject decodeReject)
123+
dmqDiffusionArguments =
124+
diffusionArguments (if handshakeTracer
125+
then WithEventType "Handshake" >$< tracer
126+
else nullTracer)
127+
(if localHandshakeTracer
128+
then WithEventType "Handshake" >$< tracer
129+
else nullTracer)
130+
dmqDiffusionApplications =
131+
diffusionApplications nodeKernel
132+
dmqConfig
133+
dmqDiffusionConfiguration
134+
dmqLimitsAndTimeouts
135+
dmqNtNApps
136+
dmqNtCApps
137+
(policy policyRng)
138+
139+
Diffusion.run dmqDiffusionArguments
140+
diffusionTracers
141+
dmqDiffusionConfiguration
142+
dmqDiffusionApplications

‎dmq-node/dmq-node.cabal‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,10 @@ executable dmq-node
135135
acts,
136136
aeson,
137137
base,
138+
cardano-crypto-class,
139+
cardano-ledger-core,
138140
contra-tracer >=0.1 && <0.3,
139141
dmq-node,
140-
io-classes,
141142
kes-agent-crypto,
142143
optparse-applicative,
143144
ouroboros-network,

‎dmq-node/src/DMQ/NodeToClient.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ import DMQ.Protocol.LocalMsgSubmission.Codec
4343
import DMQ.Protocol.LocalMsgSubmission.Server
4444
import DMQ.Protocol.LocalMsgSubmission.Type
4545
import DMQ.Protocol.SigSubmission.Type (Sig)
46+
import DMQ.Protocol.SigSubmission.Validate
4647

4748
import Ouroboros.Network.Context
4849
import Ouroboros.Network.Driver.Simple
@@ -52,9 +53,8 @@ import Ouroboros.Network.Mux
5253
import Ouroboros.Network.Protocol.Handshake (Handshake, HandshakeArguments (..))
5354
import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
5455
codecHandshake, noTimeLimitsHandshake)
55-
import Ouroboros.Network.TxSubmission.Inbound.V2.Types
56-
(TxSubmissionMempoolWriter)
5756
import Ouroboros.Network.TxSubmission.Mempool.Reader
57+
import Ouroboros.Network.TxSubmission.Mempool.Simple
5858
import Ouroboros.Network.Util.ShowProxy
5959

6060

@@ -95,8 +95,8 @@ data Codecs m sig =
9595
dmqCodecs :: ( MonadST m
9696
, Crypto crypto
9797
)
98-
=> (SigMempoolFail -> CBOR.Encoding)
99-
-> (forall s. CBOR.Decoder s SigMempoolFail)
98+
=> (MempoolAddFail (Sig crypto) -> CBOR.Encoding)
99+
-> (forall s. CBOR.Decoder s (MempoolAddFail (Sig crypto)))
100100
-> Codecs m (Sig crypto)
101101
dmqCodecs encodeReject' decodeReject' =
102102
Codecs {
@@ -127,9 +127,9 @@ data Apps ntcAddr m a =
127127
-- | Construct applications for the node-to-client protocols
128128
--
129129
ntcApps
130-
:: (MonadThrow m, MonadThread m, MonadSTM m, ShowProxy SigMempoolFail, ShowProxy sig)
130+
:: (MonadThrow m, MonadThread m, MonadSTM m, ShowProxy (MempoolAddFail sig), ShowProxy sig)
131131
=> TxSubmissionMempoolReader msgid sig idx m
132-
-> TxSubmissionMempoolWriter msgid sig idx m
132+
-> MempoolWriter msgid sig failure idx m
133133
-> Word16
134134
-> Codecs m sig
135135
-> Apps ntcAddr m ()

‎dmq-node/src/DMQ/NodeToNode.hs‎

Lines changed: 13 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ import Ouroboros.Network.PeerSharing (bracketPeerSharingClient,
9090
peerSharingClient, peerSharingServer)
9191
import Ouroboros.Network.Snocket (RemoteAddress)
9292
import Ouroboros.Network.TxSubmission.Inbound.V2 as SigSubmission
93-
import Ouroboros.Network.TxSubmission.Mempool.Simple qualified as Mempool
93+
import Ouroboros.Network.TxSubmission.Mempool.Reader
9494
import Ouroboros.Network.TxSubmission.Outbound
9595

9696
import Ouroboros.Network.OrphanInstances ()
@@ -150,12 +150,12 @@ data Apps addr m a b =
150150
}
151151

152152
ntnApps
153-
:: forall crypto m addr .
153+
:: forall crypto m addr idx.
154154
( Crypto crypto
155-
, DSIGN.ContextDSIGN (DSIGN crypto) ~ ()
156-
, DSIGN.Signable (DSIGN crypto) (OCertSignable crypto)
157-
, KES.ContextKES (KES crypto) ~ ()
158-
, KES.Signable (KES crypto) BS.ByteString
155+
-- , DSIGN.ContextDSIGN (DSIGN crypto) ~ ()
156+
-- , DSIGN.Signable (DSIGN crypto) (OCertSignable crypto)
157+
-- , KES.ContextKES (KES crypto) ~ ()
158+
-- , KES.Signable (KES crypto) BS.ByteString
159159
, Typeable crypto
160160
, Alternative (STM m)
161161
, MonadAsync m
@@ -166,12 +166,16 @@ ntnApps
166166
, MonadThrow (STM m)
167167
, MonadTimer m
168168
, Ord addr
169+
, Ord idx
169170
, Show addr
170171
, Hashable addr
171172
, Aeson.ToJSON addr
172173
)
173174
=> (forall ev. Aeson.ToJSON ev => Tracer m (WithEventType ev))
174175
-> Configuration
176+
-> TxSubmissionMempoolReader SigId (Sig crypto) idx m
177+
-> TxSubmissionMempoolWriter SigId (Sig crypto) idx m
178+
-> (Sig crypto -> SizeInBytes)
175179
-> NodeKernel crypto addr m
176180
-> Codecs crypto addr m
177181
-> LimitsAndTimeouts crypto addr
@@ -187,11 +191,13 @@ ntnApps
187191
, dmqcPeerSharingClientTracer = I peerSharingClientTracer
188192
, dmqcPeerSharingServerTracer = I peerSharingServerTracer
189193
}
194+
mempoolReader
195+
mempoolWriter
196+
sigSize
190197
NodeKernel {
191198
fetchClientRegistry
192199
, peerSharingRegistry
193200
, peerSharingAPI
194-
, mempool
195201
, sigChannelVar
196202
, sigMempoolSem
197203
, sigSharedTxStateVar
@@ -220,20 +226,6 @@ ntnApps
220226
, aPeerSharingServer
221227
}
222228
where
223-
sigSize :: Sig crypto -> SizeInBytes
224-
sigSize _ = 0 -- TODO
225-
226-
mempoolReader = Mempool.getReader sigId sigSize mempool
227-
-- TODO: invalid signatures are just omitted from the mempool. For DMQ
228-
-- we need to validate signatures when we received them, and shutdown
229-
-- connection if we receive one, rather than validate them in the
230-
-- mempool.
231-
mempoolWriter = Mempool.getWriter sigId
232-
(pure ()) -- TODO not needed
233-
(\_ -> validateSig)
234-
(\_ -> True)
235-
mempool
236-
237229
aSigSubmissionClient
238230
:: NodeToNodeVersion
239231
-> ExpandedInitiatorContext addr m

0 commit comments

Comments
 (0)