ouroboros-consensus-diffusion integrated with cardano-diffusion

Author: coot

cabal.project

@@ -14,9 +14,9 @@ repository cardano-haskell-packages
 -- update either of these.
 index-state:
   -- Bump this if you need newer packages from Hackage
-  , hackage.haskell.org 2025-07-07T23:33:30Z
+  , hackage.haskell.org 2025-07-14T12:41:02Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2025-06-03T13:42:38Z
+  , cardano-haskell-packages 2025-07-02T14:54:39Z
 
 packages:
   ouroboros-consensus
@@ -57,13 +57,8 @@ if impl (ghc >= 9.12)
     -- https://github.com/kapralVV/Unique/issues/11
     , Unique:hashable
 
-source-repository-package
-   type: git
-   location: https://github.com/IntersectMBO/ouroboros-network
-   tag: 3e8d3b4b8c87ead794876c62d7fe25f32efb5142
-   --sha256: 08fpkx3iagj83nn413h9a865zjcj3lrf7017a756qd2wg2jg3amq
-   subdir:
-     ouroboros-network-api
+allow-newer: *:QuickCheck,
+allow-newer: quickcheck-lockstep:quickcheck-dynamic
 
 source-repository-package
    type: git
@@ -97,3 +92,13 @@ source-repository-package
       libs/set-algebra
       libs/small-steps
       libs/vector-map
+
+-- QuickCheck-2.16 support
+source-repository-package
+  type: git
+  location: https://github.com/IntersectMBO/plutus
+  tag: fffd12eb25985eebb84bf5d0cb1e2f6266a36124
+  --sha256: sha256-FA0aYLjoMT/6DTwOZ+zAar5TNO+cA2716DpsUbIFjPM=
+  subdir: plutus-core
+          plutus-tx
+          plutus-ledger-api

flake.lock

@@ -16,7 +16,7 @@
       inputs.hackage.follows = "hackageNix";
     };
     hackageNix = {
-      url = "github:input-output-hk/hackage.nix";
+      url = "github:input-output-hk/hackage.nix?ref=for-stackage";
       flake = false;
     };
     CHaP = {

flake.nix

@@ -14,6 +14,8 @@ let
   };
   hsPkgs = haskell-nix.cabalProject {
     src = ./..;
+    index-state = "2025-07-14T12:41:02Z";
+    index-sha256 = "sha256-T95ADIwRyYlG41AHjkxgezWRwfMqg+a1DGlVhACwtC8=";
     compiler-nix-name = "ghc967";
     flake.variants = {
       ghc910 = { compiler-nix-name = lib.mkForce "ghc9102"; };

nix/haskell.nix

@@ -165,7 +165,7 @@ library
     nothunks,
     ouroboros-consensus ^>=0.27,
     ouroboros-consensus-protocol ^>=0.12,
-    ouroboros-network-api ^>=0.14,
+    ouroboros-network-api ^>=0.15,
     serialise ^>=0.2,
     singletons ^>=3.0,
     small-steps,
@@ -498,7 +498,7 @@ test-suite cardano-test
     tasty-hunit,
     tasty-quickcheck,
     temporary,
-    typed-protocols ^>=0.3,
+    typed-protocols ^>=1.0,
     unstable-byron-testlib,
     unstable-cardano-testlib,
     unstable-shelley-testlib,
@@ -580,7 +580,7 @@ library unstable-cardano-tools
     directory,
     dot,
     filepath,
-    fs-api ^>=0.3,
+    fs-api ^>=0.4,
     githash,
     microlens,
     mtl,
@@ -593,7 +593,7 @@ library unstable-cardano-tools
     ouroboros-consensus-protocol:{ouroboros-consensus-protocol, unstable-protocol-testlib} ^>=0.12,
     ouroboros-network,
     ouroboros-network-api,
-    ouroboros-network-framework ^>=0.18,
+    ouroboros-network-framework ^>=0.19,
     ouroboros-network-protocols,
     resource-registry,
     singletons,

ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal

@@ -379,6 +379,7 @@ instance
   supportedNodeToNodeVersions _ =
     Map.fromList $
       [ (NodeToNodeV_14, CardanoNodeToNodeVersion2)
+      , (NodeToNodeV_15, CardanoNodeToNodeVersion2)
       ]
 
   supportedNodeToClientVersions _ =
@@ -391,10 +392,7 @@ instance
       , (NodeToClientV_21, CardanoNodeToClientVersion17)
       ]
 
-  -- This is not set to NodeToClientV_21 on purpose because that one is just a
-  -- stub. Once we have a proper ouroboros-network to integrate that comes with
-  -- said version and we remove the SRP then we can bump this value.
-  latestReleasedNodeVersion _prx = (Just NodeToNodeV_14, Just NodeToClientV_20)
+  latestReleasedNodeVersion _prx = (Just NodeToNodeV_15, Just NodeToClientV_21)
 
 {-------------------------------------------------------------------------------
   ProtocolInfo

ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs

@@ -38,6 +38,7 @@ instance SupportedNetworkProtocolVersion (ShelleyBlock proto era) where
   supportedNodeToNodeVersions _ =
     Map.fromList
       [ (NodeToNodeV_14, ShelleyNodeToNodeVersion1)
+      , (NodeToNodeV_15, ShelleyNodeToNodeVersion1)
       ]
   supportedNodeToClientVersions _ =
     Map.fromList

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/NetworkProtocolVersion.hs

@@ -29,7 +29,7 @@ import Ouroboros.Consensus.Shelley.Ledger.Ledger
 instance SL.EraCertState era => LedgerSupportsPeerSelection (ShelleyBlock proto era) where
   getPeers ShelleyLedgerState{shelleyLedgerState} =
     catMaybes
-      [ (poolStake,) <$> Map.lookup stakePool poolRelayAccessPoints
+      [ (poolStake,) <$> Map.lookup stakePool poolLedgerRelayAccessPoints
       | (stakePool, poolStake) <- orderByStake poolDistr
       ]
    where
@@ -60,41 +60,41 @@ instance SL.EraCertState era => LedgerSupportsPeerSelection (ShelleyBlock proto
           . SL.nesEs
           $ shelleyLedgerState
 
-    relayToRelayAccessPoint :: SL.StakePoolRelay -> Maybe RelayAccessPoint
-    relayToRelayAccessPoint (SL.SingleHostAddr (SJust (Port port)) (SJust ipv4) _) =
-      Just $ RelayAccessAddress (IPv4 ipv4) (fromIntegral port)
-    relayToRelayAccessPoint
+    relayToLedgerRelayAccessPoint :: SL.StakePoolRelay -> Maybe LedgerRelayAccessPoint
+    relayToLedgerRelayAccessPoint (SL.SingleHostAddr (SJust (Port port)) (SJust ipv4) _) =
+      Just $ LedgerRelayAccessAddress (IPv4 ipv4) (fromIntegral port)
+    relayToLedgerRelayAccessPoint
       ( SL.SingleHostAddr
           (SJust (Port port))
           SNothing
           (SJust ipv6)
         ) =
-        Just $ RelayAccessAddress (IPv6 ipv6) (fromIntegral port)
-    relayToRelayAccessPoint (SL.SingleHostName (SJust (Port port)) dnsName) =
-      Just $ RelayAccessDomain (encodeUtf8 $ dnsToText dnsName) (fromIntegral port)
-    relayToRelayAccessPoint _ =
+        Just $ LedgerRelayAccessAddress (IPv6 ipv6) (fromIntegral port)
+    relayToLedgerRelayAccessPoint (SL.SingleHostName (SJust (Port port)) dnsName) =
+      Just $ LedgerRelayAccessDomain (encodeUtf8 $ dnsToText dnsName) (fromIntegral port)
+    relayToLedgerRelayAccessPoint _ =
       -- This could be an unsupported relay (SRV records) or an unusable
       -- relay such as a relay with an IP address but without a port number.
       Nothing
 
     -- \| Note that a stake pool can have multiple registered relays
-    pparamsRelayAccessPoints ::
-      (RelayAccessPoint -> StakePoolRelay) ->
+    pparamsLedgerRelayAccessPoints ::
+      (LedgerRelayAccessPoint -> StakePoolRelay) ->
       SL.PoolParams ->
       Maybe (NonEmpty StakePoolRelay)
-    pparamsRelayAccessPoints injStakePoolRelay =
+    pparamsLedgerRelayAccessPoints injStakePoolRelay =
       NE.nonEmpty
         . force
-        . mapMaybe (fmap injStakePoolRelay . relayToRelayAccessPoint)
+        . mapMaybe (fmap injStakePoolRelay . relayToLedgerRelayAccessPoint)
         . toList
         . SL.ppRelays
 
     -- \| Combine the stake pools registered in the future and the current pool
     -- parameters, and remove duplicates.
-    poolRelayAccessPoints ::
+    poolLedgerRelayAccessPoints ::
       Map (SL.KeyHash 'SL.StakePool) (NonEmpty StakePoolRelay)
-    poolRelayAccessPoints =
+    poolLedgerRelayAccessPoints =
       Map.unionWith
         (\futureRelays currentRelays -> NE.nub (futureRelays <> currentRelays))
-        (Map.mapMaybe (pparamsRelayAccessPoints FutureRelay) futurePoolParams)
-        (Map.mapMaybe (pparamsRelayAccessPoints CurrentRelay) poolParams)
+        (Map.mapMaybe (pparamsLedgerRelayAccessPoints FutureRelay) futurePoolParams)
+        (Map.mapMaybe (pparamsLedgerRelayAccessPoints CurrentRelay) poolParams)

ouroboros-consensus-cardano/src/shelley/Ouroboros/Consensus/Shelley/Ledger/PeerSelection.hs

@@ -58,7 +58,7 @@ import Test.Consensus.Byron.Generators ()
 import Test.Consensus.Protocol.Serialisation.Generators ()
 import Test.Consensus.Shelley.Generators
 import Test.Consensus.Shelley.MockCrypto (CanMock)
-import Test.QuickCheck
+import Test.QuickCheck hiding (Some (..))
 import Test.Util.Orphans.Arbitrary ()
 import Test.Util.Serialisation.Roundtrip
   ( Coherent (..)