Integration for Node release 11.1

cabal.project

@@ -15,14 +15,10 @@ repository cardano-haskell-packages
 -- repeat the index-state for hackage to work around haskell.nix parsing limitation
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2026-05-13T07:31:22Z
+  , hackage.haskell.org 2026-05-18T17:14:36Z
 
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2026-05-11T20:15:43Z
-
-active-repositories:
-  , :rest
-  , cardano-haskell-packages:override
+  , cardano-haskell-packages 2026-05-26T09:41:58Z
 
 packages:
   ./dmq-node
@@ -44,21 +40,60 @@ if impl(ghc >= 9.12.0)
 -- rejecting: cardano-crypto-class-2.3.1.0 (conflict: cardano-crypto-tests => cardano-crypto-class>=2.2.2 && <2.2.4)
 -- allow-newer: cardano-crypto-tests:cardano-crypto-class
 
--- ouroboros-network with PR#5376, but without contra-tracer-0.2.1.0 (PR#5368)
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-network
-  tag: 5a80699bca834a4de47aca4fe4d322832309e374
-  --sha256: sha256-FXp0gIfsUDVEE4ZuEM5y55qx0I7d5+/wQ7AjUz6UDcE=
-  subdir: network-mux
-          cardano-diffusion
-          ouroboros-network
+  tag: 10e173b21a82f6142261f0f38da0ec14c8b8a91c
+  --sha256: sha256-l3lpFzcFj2xiKaj54A7Rvhuu3s6EtzIboaHyuGhBhG8=
+  subdir:
+    cardano-diffusion
+    network-mux
+    ouroboros-network
+
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-consensus.git
+  tag: 0411b4d50dc62cab07bbbf75805cf585a7a1f8e7
+  --sha256: sha256-DNnGHdo+oQDBbHzAl6UZ/VcPoS4TxGrC9eCOiMxgc8A=
+  subdir:
+    .
 
 source-repository-package
   type: git
-  location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: ec9df6ee1d7ab918e75219107fc17e1b2cf1a0e9
-  --sha256: sha256-c+yGPftvlas2CcnFLUPPqjnitz5yTu/Qud5LaSMyY34=
+  location: https://github.com/IntersectMBO/cardano-ledger.git
+  tag: 3f879bb37df4738ed8211e500c7d180443cfcbe4
+  --sha256: sha256-uLjiIHiU1SzAmoKs+rynQphc3FUYXKeJLlOnp87uNdg=
+  subdir:
+    eras/allegra/impl
+    eras/alonzo/impl
+    eras/babbage/impl
+    eras/byron/chain/executable-spec
+    eras/byron/crypto
+    eras/byron/ledger/executable-spec
+    eras/byron/ledger/impl
+    eras/conway/impl
+    eras/dijkstra/impl
+    eras/mary/impl
+    eras/shelley-ma/test-suite
+    eras/shelley/impl
+    eras/shelley/test-suite
+    libs/cardano-data
+    libs/cardano-ledger-api
+    libs/cardano-ledger-binary
+    libs/cardano-ledger-core
+    libs/cardano-protocol-tpraos
+    libs/non-integral
+    libs/small-steps
+    libs/vector-map
+
+source-repository-package
+  type: git
+  location: https://github.com/f-f/kes-agent.git
+  tag: fdb4f4db05e3744ed413f83477020fdf43cf32a2
+  --sha256: sha256-eyQc8Dk7+upSRQvH5eXZuj6asYhOLsH59ABJZDyvQ6I=
+  subdir:
+    kes-agent
+    kes-agent-crypto
 
 -- https://github.com/bgamari/monoidal-containers/pull/112
 source-repository-package
@@ -68,7 +103,6 @@ source-repository-package
   --sha256: sha256-HkQC2Hb1OAyN8mI2BPcIylcUYF0Mts4DrffJ7Fkkh6Q=
 
 constraints: semialign >= 1.4,
-             validation < 1.2
+             validation >= 1.2 && < 2.0
 allow-newer: hedgehog-quickcheck:QuickCheck,
              monoidal-containers:semialign
-

dmq-node/dmq-node.cabal

@@ -125,7 +125,7 @@ library
     hashable >=1.0 && <1.6,
     io-classes:{io-classes, si-timers, strict-mvar, strict-stm} ^>=1.8.0.1,
     iproute ^>=1.7.15,
-    kes-agent-crypto ^>=1.1.0.0,
+    kes-agent-crypto ^>=1.2,
     mmap,
     mtl,
     network ^>=3.2.7,

dmq-node/src/DMQ/Configuration/Topology.hs

@@ -23,16 +23,11 @@ import Ouroboros.Network.OrphanInstances (localRootPeersGroupsFromJSON,
            networkTopologyFromJSON, networkTopologyToJSON)
 import System.Exit (die)
 
--- TODO: move `NoExtraConfig` and the `ToJSON NoExtraFlags` to
--- `ouroboros-network`.
+-- TODO: move `NoExtraConfig` to `ouroboros-network`.
 
 data NoExtraConfig = NoExtraConfig
   deriving Show
 
-instance ToJSON NoExtraFlags where
-  toJSON _ = Null
-  omitField _ = True
-
 instance FromJSON (NetworkTopology NoExtraConfig NoExtraFlags) where
   parseJSON = networkTopologyFromJSON
                 (localRootPeersGroupsFromJSON (\_ -> pure NoExtraFlags))

dmq-node/src/DMQ/NodeToClient.hs

@@ -51,7 +51,7 @@ import Ouroboros.Network.Handshake.Queryable (Queryable (..))
 import Ouroboros.Network.Mux
 import Ouroboros.Network.OrphanInstances ()
 import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..))
-import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
+import Ouroboros.Network.Protocol.Handshake.Codec (mkVersionedCodecCBORTerm,
            codecHandshake, noTimeLimitsHandshake)
 import Ouroboros.Network.TxSubmission.Mempool.Reader
 import Ouroboros.Network.TxSubmission.Mempool.Simple
@@ -71,7 +71,7 @@ ntcHandshakeArguments tracer =
   , haBearerTracer     = nullTracer -- TODO
   , haHandshakeCodec   = codecHandshake nodeToClientVersionCodec
   , haVersionDataCodec =
-      cborTermVersionDataCodec
+      mkVersionedCodecCBORTerm
         nodeToClientCodecCBORTerm
   , haAcceptVersion = acceptableVersion
   , haQueryVersion  = queryVersion

dmq-node/src/DMQ/NodeToNode.hs

@@ -99,7 +99,7 @@ import Ouroboros.Network.TxSubmission.Mempool.Reader
 import Ouroboros.Network.OrphanInstances ()
 
 import Ouroboros.Network.Protocol.Handshake (HandshakeArguments (..))
-import Ouroboros.Network.Protocol.Handshake.Codec (cborTermVersionDataCodec,
+import Ouroboros.Network.Protocol.Handshake.Codec (mkVersionedCodecCBORTerm,
            codecHandshake, timeLimitsHandshake)
 import Ouroboros.Network.Protocol.KeepAlive.Client (keepAliveClientPeer)
 import Ouroboros.Network.Protocol.KeepAlive.Codec (byteLimitsKeepAlive,
@@ -716,7 +716,7 @@ ntnHandshakeArguments tracer =
     haHandshakeTracer  = tracer
   , haBearerTracer     = nullTracer -- TODO
   , haHandshakeCodec   = codecHandshake nodeToNodeVersionCodec
-  , haVersionDataCodec = cborTermVersionDataCodec nodeToNodeCodecCBORTerm
+  , haVersionDataCodec = mkVersionedCodecCBORTerm nodeToNodeCodecCBORTerm
   , haAcceptVersion    = acceptableVersion
   , haQueryVersion     = queryVersion
   , haTimeLimits       = timeLimitsHandshake