Updates ouroboros-network to fix PeerSharing

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 2023-08-02T14:18:01Z
+  , hackage.haskell.org 2023-11-07T14:32:35Z
   -- Bump this if you need newer packages from CHaP
-  , cardano-haskell-packages 2023-10-26T00:00:00Z
+  , cardano-haskell-packages 2023-11-03T12:09:05Z
 
 packages:
   ouroboros-consensus
@@ -31,3 +31,8 @@ tests: true
 benchmarks: true
 
 import: ./asserts.cabal
+
+constraints:
+  -- Plutus is incompatible with 0.1.5 because of the NoThunks (Identity a)
+  -- instance, once they fix that we shall remove this constraint.
+  nothunks == 0.1.4

ouroboros-consensus-cardano/changelog.d/20231002_154149_armandoifsantos_fix_peerSharing_handshake.md

@@ -0,0 +1,15 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+### Non-Breaking
+
+- Updates dependency on `ouroboros-network-api` to `0.6.0`.

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

@@ -140,7 +140,7 @@ library
     , nothunks
     , ouroboros-consensus           ^>=0.13
     , ouroboros-consensus-protocol  ^>=0.6.0.0
-    , ouroboros-network-api         ^>=0.5.1
+    , ouroboros-network-api         ^>=0.6.0
     , serialise                     ^>=0.2
     , small-steps
     , sop-core                      ^>=0.5

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/Diffusion.hs

@@ -28,7 +28,7 @@ import           Ouroboros.Network.ErrorPolicy (nullErrorPolicies)
 import           Ouroboros.Network.IOManager (withIOManager)
 import           Ouroboros.Network.Mux
 import qualified Ouroboros.Network.NodeToNode as N2N
-import           Ouroboros.Network.PeerSelection.PeerSharing
+import           Ouroboros.Network.PeerSelection.PeerSharing.Codec
                      (decodeRemoteAddress, encodeRemoteAddress)
 import qualified Ouroboros.Network.Snocket as Snocket
 import           Ouroboros.Network.Socket (configureSocket)

ouroboros-consensus-cardano/src/unstable-cardano-tools/Cardano/Tools/ImmDBServer/MiniProtocols.hs

@@ -67,8 +67,8 @@ immDBServer ::
      , SupportedNetworkProtocolVersion blk
      )
   => CodecConfig blk
-  -> (addr -> CBOR.Encoding)
-  -> (forall s . CBOR.Decoder s addr)
+  -> (NodeToNodeVersion -> addr -> CBOR.Encoding)
+  -> (NodeToNodeVersion -> forall s . CBOR.Decoder s addr)
   -> ImmutableDB m blk
   -> NetworkMagic
   -> Versions NodeToNodeVersion NodeToNodeVersionData
@@ -90,7 +90,7 @@ immDBServer codecCfg encAddr decAddr immDB networkMagic = do
               stdVersionDataNTN
                 networkMagic
                 N2N.InitiatorOnlyDiffusionMode
-                NoPeerSharing
+                PeerSharingDisabled
           }
 
     application ::

ouroboros-consensus-diffusion/changelog.d/20231002_154502_armandoifsantos_fix_peerSharing_handshake.md

@@ -0,0 +1,16 @@
+<!--
+A new scriv changelog fragment.
+
+Uncomment the section that is right (remove the HTML comment wrapper).
+-->
+
+<!--
+### Patch
+
+- A bullet item for the Patch category.
+
+-->
+### Breaking
+
+- Adds `NodeToNodeVersion` to the arguments of `defaultCodecs` and `runWith` functions.
+

ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal

@@ -65,10 +65,10 @@ library
     , Ouroboros.Consensus.Node.NetworkProtocolVersion
 
   build-depends:
-    , base                         >=4.14   && <4.19
-    , bytestring                   >=0.10   && <0.12
+    , base                         >=4.14    && <4.19
+    , bytestring                   >=0.10    && <0.12
     , cborg                        ^>=0.2.2
-    , containers                   >=0.5    && <0.7
+    , containers                   >=0.5     && <0.7
     , contra-tracer
     , deepseq
     , filepath
@@ -77,10 +77,10 @@ library
     , io-classes                   ^>=1.2
     , mtl
     , ouroboros-consensus          ^>=0.13
-    , ouroboros-network            ^>=0.9.1
-    , ouroboros-network-api        ^>=0.5.1
-    , ouroboros-network-framework  ^>=0.9
-    , ouroboros-network-protocols  ^>=0.5.2
+    , ouroboros-network            ^>=0.10.0
+    , ouroboros-network-api        ^>=0.6.0
+    , ouroboros-network-framework  ^>=0.10
+    , ouroboros-network-protocols  ^>=0.6.0
     , random
     , serialise                    ^>=0.2
     , si-timers                    ^>=1.2

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Network/NodeToNode.hs

@@ -278,12 +278,12 @@ defaultCodecs :: forall m blk addr.
                 )
               => CodecConfig       blk
               -> BlockNodeToNodeVersion blk
-              -> (addr -> CBOR.Encoding)
-              -> (forall s . CBOR.Decoder s addr)
+              -> (NodeToNodeVersion -> addr -> CBOR.Encoding)
+              -> (NodeToNodeVersion -> forall s . CBOR.Decoder s addr)
               -> NodeToNodeVersion
               -> Codecs blk addr DeserialiseFailure m
                    ByteString ByteString ByteString ByteString ByteString ByteString ByteString
-defaultCodecs ccfg version encAddr decAddr _nodeToNodeVersion = Codecs {
+defaultCodecs ccfg version encAddr decAddr nodeToNodeVersion = Codecs {
       cChainSyncCodec =
         codecChainSync
           enc
@@ -325,7 +325,7 @@ defaultCodecs ccfg version encAddr decAddr _nodeToNodeVersion = Codecs {
 
     , cKeepAliveCodec = codecKeepAlive_v2
 
-    , cPeerSharingCodec = codecPeerSharing encAddr decAddr
+    , cPeerSharingCodec = codecPeerSharing (encAddr nodeToNodeVersion) (decAddr nodeToNodeVersion)
     }
   where
     p :: Proxy blk

ouroboros-consensus-diffusion/src/ouroboros-consensus-diffusion/Ouroboros/Consensus/Node.hs

@@ -118,8 +118,9 @@ import           Ouroboros.Network.PeerSelection.LedgerPeers
                      (LedgerPeersConsensusInterface (..))
 import           Ouroboros.Network.PeerSelection.PeerMetric (PeerMetrics,
                      newPeerMetric, reportMetric)
-import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing,
-                     decodeRemoteAddress, encodeRemoteAddress)
+import           Ouroboros.Network.PeerSelection.PeerSharing (PeerSharing)
+import           Ouroboros.Network.PeerSelection.PeerSharing.Codec
+                     (decodeRemoteAddress, encodeRemoteAddress)
 import           Ouroboros.Network.Protocol.Limits (shortWait)
 import           Ouroboros.Network.Protocol.PeerSharing.Type (PeerSharingAmount)
 import           Ouroboros.Network.RethrowPolicy
@@ -309,8 +310,8 @@ runWith :: forall m addrNTN addrNTC versionDataNTN versionDataNTC blk p2p.
      , NetworkAddr addrNTN
      )
   => RunNodeArgs m addrNTN addrNTC blk p2p
-  -> (addrNTN -> CBOR.Encoding)
-  -> (forall s . CBOR.Decoder s addrNTN)
+  -> (NodeToNodeVersion -> addrNTN -> CBOR.Encoding)
+  -> (NodeToNodeVersion -> forall s . CBOR.Decoder s addrNTN)
   -> LowLevelRunNodeArgs m addrNTN addrNTC versionDataNTN versionDataNTC blk p2p
   -> m ()
 runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
@@ -420,8 +421,8 @@ runWith RunNodeArgs{..} encAddrNtN decAddrNtN LowLevelRunNodeArgs{..} =
       :: NodeKernelArgs m addrNTN (ConnectionId addrNTC) blk
       -> NodeKernel     m addrNTN (ConnectionId addrNTC) blk
       -> PeerMetrics m addrNTN
-      -> (addrNTN -> CBOR.Encoding)
-      -> (forall s . CBOR.Decoder s addrNTN)
+      -> (NodeToNodeVersion -> addrNTN -> CBOR.Encoding)
+      -> (NodeToNodeVersion -> forall s . CBOR.Decoder s addrNTN)
       -> BlockNodeToNodeVersion blk
       -> (PeerSharingAmount -> m [addrNTN])
       -- ^ Peer Sharing result computation callback
@@ -739,6 +740,7 @@ stdChainSyncTimeout = do
       { canAwaitTimeout  = shortWait
       , intersectTimeout = shortWait
       , mustReplyTimeout
+      , idleTimeout      = Just 3673
       }
 
 stdVersionDataNTN :: NetworkMagic

ouroboros-consensus-diffusion/src/unstable-diffusion-testlib/Test/ThreadNet/Network.hs

@@ -1014,6 +1014,7 @@ runThreadNetwork systemTime ThreadNetworkArgs
                      { canAwaitTimeout  = waitForever
                      , intersectTimeout = waitForever
                      , mustReplyTimeout = waitForever
+                     , idleTimeout      = waitForever
                      })
                   nullMetric
                   -- The purpose of this test is not testing protocols, so
@@ -1097,7 +1098,7 @@ runThreadNetwork systemTime ThreadNetworkArgs
               NTN.cPeerSharingCodec NTN.identityCodecs
         }
       where
-        binaryProtocolCodecs = NTN.defaultCodecs (configCodec cfg) blockVersion encodeNodeId decodeNodeId ntnVersion
+        binaryProtocolCodecs = NTN.defaultCodecs (configCodec cfg) blockVersion (const encodeNodeId) (const decodeNodeId) ntnVersion
 
 -- | Sum of 'CodecFailure' (from @identityCodecs@) and 'DeserialiseFailure'
 -- (from @defaultCodecs@).
@@ -1347,7 +1348,7 @@ directedEdgeInner registry clock (version, blockVersion) (cfg, calcMessageDelay)
           _ -> pure ()
       where
         codec =
-            NTN.cChainSyncCodec $ NTN.defaultCodecs cfg blockVersion encodeNodeId decodeNodeId version
+            NTN.cChainSyncCodec $ NTN.defaultCodecs cfg blockVersion (const encodeNodeId) (const decodeNodeId) version
 
 -- | Variant of 'createConnectChannels' with intermediate queues for
 -- delayed-but-in-order messages

ouroboros-consensus/ouroboros-consensus.cabal

@@ -261,9 +261,9 @@ library
     , measures
     , mtl
     , nothunks                     ^>=0.1.2
-    , ouroboros-network-api        ^>=0.5.1
+    , ouroboros-network-api        ^>=0.6.0
     , ouroboros-network-mock       ^>=0.1.0.1
-    , ouroboros-network-protocols  ^>=0.5
+    , ouroboros-network-protocols  ^>=0.6
     , psqueues                     ^>=0.2.3
     , quiet                        ^>=0.2
     , semialign                    >=1.1