Skip to content

cardano-node-10.5.4 with ourboros-network-0.21.6.0 #6400

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
coot merged 1 commit into from
Jan 5, 2026
Merged

cardano-node-10.5.4 with ourboros-network-0.21.6.0 #6400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bench/locli/locli.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions cardano-node/cardano-node.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
6 changes: 4 additions & 2 deletions cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion cardano-submit-api/cardano-submit-api.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cardano-testnet/cardano-testnet.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions cardano-tracer/cardano-tracer.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions flake.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion trace-dispatcher/trace-dispatcher.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading