Skip to content

Commit 4618ce3

Browse files
committed
Update to Node 10.6
1 parent bb5ee53 commit 4618ce3

File tree

52 files changed

+750
-484
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+750
-484
lines changed

cabal.project

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ repository cardano-haskell-packages
1010
d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee
1111

1212
index-state:
13-
, hackage.haskell.org 2025-08-03T21:32:16Z
14-
, cardano-haskell-packages 2025-07-30T14:13:57Z
13+
, hackage.haskell.org 2025-10-17T00:26:22Z
14+
, cardano-haskell-packages 2025-11-07T15:42:47Z
1515

1616
packages:
1717
cardano-db
@@ -75,7 +75,6 @@ constraints:
7575
-- then clashes with the `show` in `Prelude`.
7676
, text < 2.1.2
7777

78-
, cardano-node ^>= 10.4
7978

8079
if impl (ghc >= 9.12)
8180
allow-newer:
@@ -86,3 +85,14 @@ if impl (ghc >= 9.12)
8685
-- when using the "cabal" wrapper script provided by nix-shell.
8786
-- --------------------------- 8< --------------------------
8887
-- Please do not put any `source-repository-package` clause above this line.
88+
89+
source-repository-package
90+
type: git
91+
location: https://github.com/IntersectMBO/cardano-node
92+
tag: f5ac0eb01b56af80e8d430828ff6000b6abb92e9
93+
--sha256: sha256-pm+lbEiRdQesnkaXmzn58aWlBhD29l7QHGNtJiDlzuA=
94+
subdir:
95+
cardano-node
96+
trace-dispatcher
97+
trace-forward
98+
trace-resources

cardano-chain-gen/cardano-chain-gen.cabal

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ library
8383
, extra
8484
, mtl
8585
, microlens
86-
, network-mux
86+
, network
8787
, nothunks
8888
, ouroboros-consensus
8989
, ouroboros-consensus-cardano
@@ -97,10 +97,10 @@ library
9797
, plutus-ledger-api:{plutus-ledger-api-testlib}
9898
, serialise
9999
, strict-sop-core
100-
, strict-stm
100+
, io-classes:strict-stm
101101
, text
102102
, typed-protocols
103-
, typed-protocols-stateful
103+
, typed-protocols:stateful
104104

105105
test-suite cardano-chain-gen
106106
type: exitcode-stdio-1.0
@@ -183,9 +183,9 @@ test-suite cardano-chain-gen
183183
, extra
184184
, filepath
185185
, int-cast
186+
, io-classes:strict-stm
186187
, silently
187188
, stm
188-
, strict-stm
189189
, tasty
190190
, tasty-quickcheck
191191
, text

cardano-chain-gen/src/Cardano/Mock/ChainSync/Server.hs

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,11 @@ import Control.Tracer (nullTracer)
4848
import Data.ByteString.Lazy.Char8 (ByteString)
4949
import qualified Data.Map.Strict as Map
5050
import Data.Maybe (fromJust)
51-
import Data.Void (Void)
52-
import qualified Network.Mux as Mux
5351
import Network.TypedProtocol.Peer (Peer (..))
54-
import Network.TypedProtocol.Stateful.Codec ()
52+
53+
-- import Network.TypedProtocol.Stateful.Codec ()
54+
55+
import qualified Network.Socket as Socket
5556
import qualified Network.TypedProtocol.Stateful.Peer as St
5657
import Ouroboros.Consensus.Block (CodecConfig, HasHeader, Point, StandardHash, castPoint)
5758
import Ouroboros.Consensus.Config (TopLevelConfig, configCodec)
@@ -65,7 +66,6 @@ import Ouroboros.Consensus.Node.DbMarker ()
6566
import Ouroboros.Consensus.Node.InitStorage ()
6667
import Ouroboros.Consensus.Node.NetworkProtocolVersion (
6768
BlockNodeToClientVersion,
68-
NodeToClientVersion,
6969
SupportedNetworkProtocolVersion,
7070
latestReleasedNodeVersion,
7171
supportedNodeToClientVersions,
@@ -87,27 +87,26 @@ import Ouroboros.Network.Block (
8787
)
8888
import Ouroboros.Network.Channel (Channel)
8989
import Ouroboros.Network.Driver.Simple (runPeer)
90-
import qualified Ouroboros.Network.Driver.Stateful as St (runPeer)
91-
import Ouroboros.Network.IOManager (IOManager)
92-
import qualified Ouroboros.Network.IOManager as IOManager
90+
import qualified Ouroboros.Network.Driver.Stateful as Stateful
9391
import Ouroboros.Network.Magic (NetworkMagic)
94-
import Ouroboros.Network.Mux (OuroborosApplicationWithMinimalCtx)
95-
import Ouroboros.Network.NodeToClient (NodeToClientVersionData (..))
96-
import qualified Ouroboros.Network.NodeToClient as NodeToClient
97-
import Ouroboros.Network.NodeToNode (Versions)
92+
import Ouroboros.Network.NodeToClient
9893
import Ouroboros.Network.Protocol.ChainSync.Server (
9994
ChainSyncServer (..),
10095
ServerStIdle (..),
10196
ServerStIntersect (..),
10297
ServerStNext (SendMsgRollBackward, SendMsgRollForward),
10398
chainSyncServerPeer,
10499
)
105-
import Ouroboros.Network.Protocol.Handshake.Version (simpleSingletonVersions)
100+
import Ouroboros.Network.Protocol.Handshake
106101
import qualified Ouroboros.Network.Protocol.LocalStateQuery.Type as LocalStateQuery
107-
import Ouroboros.Network.Snocket (LocalAddress, LocalSnocket, LocalSocket (..))
102+
import Ouroboros.Network.Server.Simple as Server
103+
import Ouroboros.Network.Snocket
108104
import qualified Ouroboros.Network.Snocket as Snocket
105+
import Ouroboros.Network.Socket
109106
import Ouroboros.Network.Util.ShowProxy (Proxy (..), ShowProxy (..))
110107

108+
-- import qualified Network.TypedProtocol.Stateful.Codec as Stateful
109+
111110
{- HLINT ignore "Use readTVarIO" -}
112111

113112
data ServerHandle m blk = ServerHandle
@@ -212,33 +211,41 @@ runLocalServer ::
212211
FilePath ->
213212
StrictTVar IO (ChainProducerState blk) ->
214213
IO ()
215-
runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
216-
withSnocket iom localDomainSock $ \localSocket localSnocket -> do
217-
networkState <- NodeToClient.newNetworkMutableState
218-
_ <-
219-
NodeToClient.withServer
220-
localSnocket
221-
NodeToClient.nullNetworkServerTracers -- debuggingNetworkServerTracers
222-
networkState
223-
localSocket
224-
(versions chainProdState)
225-
NodeToClient.networkErrorPolicies
226-
pure ()
214+
runLocalServer iom codecConfig netMagic localDomainSock chainProdState = do
215+
_ <-
216+
Server.with
217+
(Snocket.socketSnocket iom)
218+
makeSocketBearer -- makeLocalBearer --
219+
(\_ _ -> pure ())
220+
(Socket.SockAddrUnix localDomainSock)
221+
( HandshakeArguments
222+
{ haHandshakeTracer = nullTracer
223+
, haBearerTracer = nullTracer
224+
, haHandshakeCodec = codecHandshake nodeToClientVersionCodec
225+
, haVersionDataCodec = cborTermVersionDataCodec nodeToClientCodecCBORTerm
226+
, haAcceptVersion = acceptableVersion
227+
, haQueryVersion = queryVersion
228+
, haTimeLimits = noTimeLimitsHandshake
229+
}
230+
)
231+
(versions chainProdState)
232+
(\_ serverAsync -> wait serverAsync)
233+
pure ()
227234
where
228235
versions ::
229236
StrictTVar IO (ChainProducerState blk) ->
230237
Versions
231238
NodeToClientVersion
232239
NodeToClientVersionData
233-
(OuroborosApplicationWithMinimalCtx 'Mux.ResponderMode LocalAddress ByteString IO Void ())
240+
(SomeResponderApplication Socket.SockAddr ByteString IO ())
234241
versions state =
235242
let version = fromJust $ snd $ latestReleasedNodeVersion (Proxy @blk)
236243
allVersions = supportedNodeToClientVersions (Proxy @blk)
237244
blockVersion = fromJust $ Map.lookup version allVersions
238245
in simpleSingletonVersions
239246
version
240247
(NodeToClientVersionData netMagic False)
241-
(\versionData -> NTC.responder version versionData $ mkApps state version blockVersion (NTC.defaultCodecs codecConfig blockVersion version))
248+
(\versionData' -> SomeResponderApplication $ NTC.responder version versionData' $ mkApps state version blockVersion (NTC.defaultCodecs codecConfig blockVersion version))
242249

243250
mkApps ::
244251
StrictTVar IO (ChainProducerState blk) ->
@@ -263,8 +270,7 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
263270
nullTracer -- TODO add a tracer!
264271
(cChainSyncCodec codecs)
265272
channel
266-
$ chainSyncServerPeer
267-
$ chainSyncServer state codecConfig blockVersion
273+
(chainSyncServerPeer $ chainSyncServer state codecConfig blockVersion)
268274

269275
txSubmitServer ::
270276
localPeer ->
@@ -277,12 +283,12 @@ runLocalServer iom codecConfig netMagic localDomainSock chainProdState =
277283
channel
278284
(Effect (forever $ threadDelay 3_600_000_000))
279285

280-
stateQueryServer ::
281-
localPeer ->
282-
Channel IO ByteString ->
283-
IO ((), Maybe ByteString)
286+
-- stateQueryServer ::
287+
-- localPeer ->
288+
-- Channel IO ByteString ->
289+
-- IO ((), Maybe ByteString)
284290
stateQueryServer _them channel =
285-
St.runPeer
291+
Stateful.runPeer
286292
nullTracer
287293
(cStateQueryCodec codecs)
288294
channel
@@ -405,6 +411,7 @@ chainSyncServer state codec _blockVersion =
405411
let chain = chainDB cps'
406412
pure (castTip (headTip chain), u)
407413

414+
{-}
408415
withSnocket ::
409416
forall a.
410417
IOManager ->
@@ -434,6 +441,4 @@ withSnocket iocp localDomainSock k =
434441
Snocket.bind sn sd (Snocket.localAddressFromPath localDomainSock)
435442
Snocket.listen sn sd
436443
k sd sn
437-
438-
withIOManager :: (IOManager -> IO a) -> IO a
439-
withIOManager = IOManager.withIOManager
444+
-}

0 commit comments

Comments
 (0)