Skip to content

Commit a9263dc

Browse files
cootcoot
authored
Merge pull request #6400 from IntersectMBO/coot/release-10.5.4
cardano-node-10.5.4 with ourboros-network-0.21.6.0
2 parents 6c034ec + 70c6069 commit a9263dc

File tree

10 files changed

+26
-22
lines changed

10 files changed

+26
-22
lines changed

‎bench/locli/locli.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ library
126126
, hashable
127127
, optparse-applicative-fork >= 0.18.1
128128
, ouroboros-consensus
129-
, ouroboros-network-api ^>= 0.14.1
129+
, ouroboros-network-api ^>= 0.14.2
130130
, sop-core
131131
, split
132132
, sqlite-easy >= 1.1.0.1

‎cabal.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2025-06-03T08:07:10Z
17-
, cardano-haskell-packages 2025-11-20T19:55:27Z
17+
, cardano-haskell-packages 2026-01-05T11:07:19Z
1818

1919
packages:
2020
cardano-node

‎cardano-node/cardano-node.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.8
22

33
name: cardano-node
4-
version: 10.5.3
4+
version: 10.5.4
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -197,8 +197,8 @@ library
197197
, ouroboros-consensus-cardano ^>= 0.25
198198
, ouroboros-consensus-diffusion ^>= 0.23
199199
, ouroboros-consensus-protocol
200-
, ouroboros-network-api ^>= 0.14.1
201-
, ouroboros-network ^>= 0.21.4
200+
, ouroboros-network-api ^>= 0.14.2
201+
, ouroboros-network ^>= 0.21.5
202202
, ouroboros-network-framework ^>= 0.18
203203
, ouroboros-network-protocols ^>= 0.14
204204
, prettyprinter

‎cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -313,13 +313,14 @@ instance LogFormatting (TracePeerSelection Cardano.DebugPeerSelectionState PeerT
313313
, "targetLocalEstablished" .= tLocalEst
314314
, "selectedPeers" .= toJSONList (toList sp)
315315
]
316-
forMachine _dtal (TracePromoteColdFailed tEst aEst p d err) =
316+
forMachine _dtal (TracePromoteColdFailed tEst aEst p d err forgotten) =
317317
mconcat [ "kind" .= String "PromoteColdFailed"
318318
, "targetEstablished" .= tEst
319319
, "actualEstablished" .= aEst
320320
, "peer" .= toJSON p
321321
, "delay" .= toJSON d
322322
, "reason" .= show err
323+
, "forgotten" .= forgotten
323324
]
324325
forMachine _dtal (TracePromoteColdDone tEst aEst p) =
325326
mconcat [ "kind" .= String "PromoteColdDone"
@@ -333,13 +334,14 @@ instance LogFormatting (TracePeerSelection Cardano.DebugPeerSelectionState PeerT
333334
, "actualEstablished" .= actualKnown
334335
, "selectedPeers" .= toJSONList (toList sp)
335336
]
336-
forMachine _dtal (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err) =
337+
forMachine _dtal (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err forgotten) =
337338
mconcat [ "kind" .= String "PromoteColdBigLedgerPeerFailed"
338339
, "targetEstablished" .= tEst
339340
, "actualEstablished" .= aEst
340341
, "peer" .= toJSON p
341342
, "delay" .= toJSON d
342343
, "reason" .= show err
344+
, "forgotten" .= forgotten
343345
]
344346
forMachine _dtal (TracePromoteColdBigLedgerPeerDone tEst aEst p) =
345347
mconcat [ "kind" .= String "PromoteColdBigLedgerPeerDone"

‎cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1913,13 +1913,14 @@ instance ToObject (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrusta
19131913
, "targetLocalEstablished" .= tLocalEst
19141914
, "selectedPeers" .= Aeson.toJSONList (toList sp)
19151915
]
1916-
toObject _verb (TracePromoteColdFailed tEst aEst p d err) =
1916+
toObject _verb (TracePromoteColdFailed tEst aEst p d err forgotten) =
19171917
mconcat [ "kind" .= String "PromoteColdFailed"
19181918
, "targetEstablished" .= tEst
19191919
, "actualEstablished" .= aEst
19201920
, "peer" .= toJSON p
19211921
, "delay" .= toJSON d
19221922
, "reason" .= show err
1923+
, "forgoeten" .= forgotten
19231924
]
19241925
toObject _verb (TracePromoteColdDone tEst aEst p) =
19251926
mconcat [ "kind" .= String "PromoteColdDone"
@@ -1933,13 +1934,14 @@ instance ToObject (TracePeerSelection Cardano.DebugPeerSelectionState PeerTrusta
19331934
, "actualEstablished" .= actualKnown
19341935
, "selectedPeers" .= Aeson.toJSONList (toList sp)
19351936
]
1936-
toObject _verb (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err) =
1937+
toObject _verb (TracePromoteColdBigLedgerPeerFailed tEst aEst p d err forgotten) =
19371938
mconcat [ "kind" .= String "PromoteColdBigLedgerPeerFailed"
19381939
, "targetEstablished" .= tEst
19391940
, "actualEstablished" .= aEst
19401941
, "peer" .= toJSON p
19411942
, "delay" .= toJSON d
19421943
, "reason" .= show err
1944+
, "forgotten" .= forgotten
19431945
]
19441946
toObject _verb (TracePromoteColdBigLedgerPeerDone tEst aEst p) =
19451947
mconcat [ "kind" .= String "PromoteColdBigLedgerPeerDone"

‎cardano-submit-api/cardano-submit-api.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ library
4949
, network
5050
, optparse-applicative-fork
5151
, ouroboros-consensus-cardano
52-
, ouroboros-network ^>= 0.21.4
52+
, ouroboros-network ^>= 0.21.5
5353
, ouroboros-network-protocols
5454
, prometheus >= 2.2.4
5555
, servant

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ library
7272
, network
7373
, network-mux
7474
, optparse-applicative-fork
75-
, ouroboros-network ^>= 0.21.4
75+
, ouroboros-network ^>= 0.21.5
7676
, ouroboros-network-api
7777
, prettyprinter
7878
, process

‎cardano-tracer/cardano-tracer.cabal‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ library
183183
, mime-mail
184184
, network-mux >= 0.8
185185
, optparse-applicative
186-
, ouroboros-network ^>= 0.21.4
187-
, ouroboros-network-api ^>= 0.14.1
186+
, ouroboros-network ^>= 0.21.5
187+
, ouroboros-network-api ^>= 0.14.2
188188
, ouroboros-network-framework
189189
, signal
190190
, slugify
@@ -250,7 +250,7 @@ library demo-forwarder-lib
250250
, generic-data
251251
, network-mux
252252
, optparse-applicative-fork >= 0.18.1
253-
, ouroboros-network-api ^>= 0.14.1
253+
, ouroboros-network-api ^>= 0.14.2
254254
, ouroboros-network-framework
255255
, tasty-quickcheck
256256
, time
@@ -293,7 +293,7 @@ library demo-acceptor-lib
293293
, filepath
294294
, generic-data
295295
, optparse-applicative-fork >= 0.18.1
296-
, ouroboros-network-api ^>= 0.14.1
296+
, ouroboros-network-api ^>= 0.14.2
297297
, stm <2.5.2 || >=2.5.3
298298
, text
299299
, tasty-quickcheck
@@ -352,7 +352,7 @@ test-suite cardano-tracer-test
352352
, generic-data
353353
, network-mux
354354
, optparse-applicative-fork >= 0.18.1
355-
, ouroboros-network-api ^>= 0.14.1
355+
, ouroboros-network-api ^>= 0.14.2
356356
, ouroboros-network-framework
357357
, stm <2.5.2 || >=2.5.3
358358
, tasty
@@ -411,8 +411,8 @@ test-suite cardano-tracer-test-ext
411411
, Glob
412412
, network-mux
413413
, optparse-applicative-fork >= 0.18.1
414-
, ouroboros-network ^>= 0.21.4
415-
, ouroboros-network-api ^>= 0.14.1
414+
, ouroboros-network ^>= 0.21.5
415+
, ouroboros-network-api ^>= 0.14.2
416416
, ouroboros-network-framework
417417
, process
418418
, QuickCheck

‎flake.lock‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎trace-dispatcher/trace-dispatcher.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ library
7373
, network
7474
, network-mux
7575
, optparse-applicative-fork
76-
, ouroboros-network ^>= 0.21.4
76+
, ouroboros-network ^>= 0.21.5
7777
, ouroboros-network-api
7878
, ouroboros-network-framework
7979
, serialise

0 commit comments

Comments
 (0)