diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal index ff4ec413e6b..ef85c76f0ad 100644 --- a/bench/locli/locli.cabal +++ b/bench/locli/locli.cabal @@ -126,7 +126,7 @@ library , hashable , optparse-applicative-fork >= 0.18.1 , ouroboros-consensus - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network-api ^>= 0.14.2 , sop-core , split , sqlite-easy >= 1.1.0.1 diff --git a/cabal.project b/cabal.project index 84ceb394ca0..8f157aa2ad6 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2025-06-03T08:07:10Z - , cardano-haskell-packages 2025-11-20T19:55:27Z + , cardano-haskell-packages 2026-01-05T11:07:19Z packages: cardano-node diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 0b897d473d4..1dc80c10f6c 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -1,7 +1,7 @@ cabal-version: 3.8 name: cardano-node -version: 10.5.3 +version: 10.5.4 synopsis: The cardano full node description: The cardano full node. category: Cardano, @@ -197,8 +197,8 @@ library , ouroboros-consensus-cardano ^>= 0.25 , ouroboros-consensus-diffusion ^>= 0.23 , ouroboros-consensus-protocol - , ouroboros-network-api ^>= 0.14.1 - , ouroboros-network ^>= 0.21.4 + , ouroboros-network-api ^>= 0.14.2 + , ouroboros-network ^>= 0.21.5 , ouroboros-network-framework ^>= 0.18 , ouroboros-network-protocols ^>= 0.14 , prettyprinter diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index 311e53a6070..a7b65c4d782 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -313,13 +313,14 @@ instance LogFormatting (TracePeerSelection Cardano.DebugPeerSelectionState PeerT , "targetLocalEstablished" .= tLocalEst , "selectedPeers" .= toJSONList (toList sp) ] - forMachine _dtal (TracePromoteColdFailed tEst aEst p d err) = + forMachine _dtal (TracePromoteColdFailed tEst aEst p d err forgotten) = mconcat [ "kind" .= String "PromoteColdFailed" , "targetEstablished" .= tEst , "actualEstablished" .= aEst , "peer" .= toJSON p , "delay" .= toJSON d , "reason" .= show err + , "forgotten" .= forgotten ] forMachine _dtal (TracePromoteColdDone tEst aEst p) = mconcat [ "kind" .= String "PromoteColdDone" @@ -333,13 +334,14 @@ instance LogFormatting (TracePeerSelection Cardano.DebugPeerSelectionState PeerT , "actualEstablished" .= actualKnown , "selectedPeers" .= toJSONList (toList sp) ] - forMachine _dtal (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err) = + forMachine _dtal (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err forgotten) = mconcat [ "kind" .= String "PromoteColdBigLedgerPeerFailed" , "targetEstablished" .= tEst , "actualEstablished" .= aEst , "peer" .= toJSON p , "delay" .= toJSON d , "reason" .= show err + , "forgotten" .= forgotten ] forMachine _dtal (TracePromoteColdBigLedgerPeerDone tEst aEst p) = mconcat [ "kind" .= String "PromoteColdBigLedgerPeerDone" diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs index 5e3398c9174..97cbc1aeeb5 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs @@ -1913,13 +1913,14 @@ instance ToObject (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrusta , "targetLocalEstablished" .= tLocalEst , "selectedPeers" .= Aeson.toJSONList (toList sp) ] - toObject _verb (TracePromoteColdFailed tEst aEst p d err) = + toObject _verb (TracePromoteColdFailed tEst aEst p d err forgotten) = mconcat [ "kind" .= String "PromoteColdFailed" , "targetEstablished" .= tEst , "actualEstablished" .= aEst , "peer" .= toJSON p , "delay" .= toJSON d , "reason" .= show err + , "forgoeten" .= forgotten ] toObject _verb (TracePromoteColdDone tEst aEst p) = mconcat [ "kind" .= String "PromoteColdDone" @@ -1933,13 +1934,14 @@ instance ToObject (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrusta , "actualEstablished" .= actualKnown , "selectedPeers" .= Aeson.toJSONList (toList sp) ] - toObject _verb (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err) = + toObject _verb (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err forgotten) = mconcat [ "kind" .= String "PromoteColdBigLedgerPeerFailed" , "targetEstablished" .= tEst , "actualEstablished" .= aEst , "peer" .= toJSON p , "delay" .= toJSON d , "reason" .= show err + , "forgotten" .= forgotten ] toObject _verb (TracePromoteColdBigLedgerPeerDone tEst aEst p) = mconcat [ "kind" .= String "PromoteColdBigLedgerPeerDone" diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index 873cc5ef41b..cbb7b4aaf8f 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -49,7 +49,7 @@ library , network , optparse-applicative-fork , ouroboros-consensus-cardano - , ouroboros-network ^>= 0.21.4 + , ouroboros-network ^>= 0.21.5 , ouroboros-network-protocols , prometheus >= 2.2.4 , servant diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index 61afb98fbcd..fe271fab03c 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -72,7 +72,7 @@ library , network , network-mux , optparse-applicative-fork - , ouroboros-network ^>= 0.21.4 + , ouroboros-network ^>= 0.21.5 , ouroboros-network-api , prettyprinter , process diff --git a/cardano-tracer/cardano-tracer.cabal b/cardano-tracer/cardano-tracer.cabal index bb9f1f0c526..650829580c9 100644 --- a/cardano-tracer/cardano-tracer.cabal +++ b/cardano-tracer/cardano-tracer.cabal @@ -183,8 +183,8 @@ library , mime-mail , network-mux >= 0.8 , optparse-applicative - , ouroboros-network ^>= 0.21.4 - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network ^>= 0.21.5 + , ouroboros-network-api ^>= 0.14.2 , ouroboros-network-framework , signal , slugify @@ -250,7 +250,7 @@ library demo-forwarder-lib , generic-data , network-mux , optparse-applicative-fork >= 0.18.1 - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network-api ^>= 0.14.2 , ouroboros-network-framework , tasty-quickcheck , time @@ -293,7 +293,7 @@ library demo-acceptor-lib , filepath , generic-data , optparse-applicative-fork >= 0.18.1 - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network-api ^>= 0.14.2 , stm <2.5.2 || >=2.5.3 , text , tasty-quickcheck @@ -352,7 +352,7 @@ test-suite cardano-tracer-test , generic-data , network-mux , optparse-applicative-fork >= 0.18.1 - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network-api ^>= 0.14.2 , ouroboros-network-framework , stm <2.5.2 || >=2.5.3 , tasty @@ -411,8 +411,8 @@ test-suite cardano-tracer-test-ext , Glob , network-mux , optparse-applicative-fork >= 0.18.1 - , ouroboros-network ^>= 0.21.4 - , ouroboros-network-api ^>= 0.14.1 + , ouroboros-network ^>= 0.21.5 + , ouroboros-network-api ^>= 0.14.2 , ouroboros-network-framework , process , QuickCheck diff --git a/flake.lock b/flake.lock index 7f80efc9b8f..893c62a48ef 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1763670101, - "narHash": "sha256-3S6OSnW0Nn+YBVmuV0XnYQRAuS3i0F9lRdH4KQiN1uI=", + "lastModified": 1767613196, + "narHash": "sha256-+YMGLWk1IKQms4XbwwJUsW+n/LXm74H2MgBeuZSpnD8=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "d341a38325d5d65cde10fa92af125b226c51615f", + "rev": "d78f79845cfcde6497c0afef650a51a1cff01777", "type": "github" }, "original": { diff --git a/trace-dispatcher/trace-dispatcher.cabal b/trace-dispatcher/trace-dispatcher.cabal index 6fe6dd1fa13..4ffb9228f34 100644 --- a/trace-dispatcher/trace-dispatcher.cabal +++ b/trace-dispatcher/trace-dispatcher.cabal @@ -73,7 +73,7 @@ library , network , network-mux , optparse-applicative-fork - , ouroboros-network ^>= 0.21.4 + , ouroboros-network ^>= 0.21.5 , ouroboros-network-api , ouroboros-network-framework , serialise