Skip to content

Commit 5d5f5a6

Browse files
jasagredojasagredo
committed
WIP
1 parent 438d3df commit 5d5f5a6

File tree

7 files changed

+56
-45
lines changed

7 files changed

+56
-45
lines changed

‎bench/tx-generator/tx-generator.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ library
113113
, bytestring
114114
, cardano-api ^>= 10.19
115115
, cardano-binary
116-
, cardano-cli ^>= 10.12
116+
, cardano-cli ^>= 10.13
117117
, cardano-crypto-class
118118
, cardano-crypto-wrapper
119119
, cardano-data

‎cabal.project‎

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2025-10-23T13:39:53Z
17-
, cardano-haskell-packages 2025-10-21T11:16:53Z
17+
, cardano-haskell-packages 2025-10-24T10:49:53Z
1818

1919
packages:
2020
cardano-node
2121
cardano-node-capi
22-
-- cardano-node-chairman
22+
cardano-node-chairman
2323
cardano-submit-api
2424
cardano-testnet
2525
cardano-tracer
@@ -76,8 +76,8 @@ if impl (ghc >= 9.12)
7676
source-repository-package
7777
type: git
7878
location: https://github.com/intersectmbo/cardano-cli.git
79-
tag: 031b7e80c2596b07797b553f96a6a772f1d83d7d
80-
--sha256: sha256-XsfV4/Bz1/AahhlBgW1wMKR6njGN4BmHIPSutL7jH4U=
79+
tag: 6e54ff23dd15e988db93bf29dd4a1e7e67a0db56
80+
--sha256: sha256-S8YKmbx6hnpi/FQjkWkH5qsxVQngsxJqYh4OJ4ySJco=
8181
subdir: cardano-cli
8282

8383
source-repository-package
@@ -98,21 +98,6 @@ source-repository-package
9898
ouroboros-consensus-cardano
9999
ouroboros-consensus-diffusion
100100

101-
source-repository-package
102-
type: git
103-
location: https://github.com/IntersectMBO/plutus
104-
tag: 9e57d691fed8a4a8c7f6dc32f07e80a6dd271d36
105-
--sha256: sha256-TIKoJJoebIEbsgk5olrKcfb6upgmyhU5cXgP2TmfFO8=
106-
subdir: cardano-constitution
107-
plutus-benchmark
108-
plutus-conformance
109-
plutus-core
110-
plutus-executables
111-
plutus-ledger-api
112-
plutus-metatheory
113-
plutus-tx
114-
plutus-tx-plugin
115-
116101
source-repository-package
117102
type: git
118103
location: https://github.com/IntersectMBO/cardano-ledger
@@ -155,8 +140,8 @@ allow-newer:
155140
source-repository-package
156141
type: git
157142
location: https://github.com/IntersectMBO/ouroboros-network
158-
tag: b07a86ed853b63881b5a83e57508902f1562ac01
159-
--sha256: sha256-n/XX0+cQegq2a1cAfmGx30T64eix4oEXzpVEFCKqmg0=
143+
tag: 1385b53cefb81e79553b6b0252537455833ea9c4
144+
--sha256: sha256-zZ7WsMfRs1fG16bmvI5vIh4fhQ8RGyEvYGLSWlrxpg0=
160145
subdir:
161146
ouroboros-network-api
162147
ouroboros-network

‎cardano-node-chairman/cardano-node-chairman.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ executable cardano-node-chairman
4444
build-depends: cardano-api
4545
, cardano-crypto-class
4646
, cardano-git-rev ^>= 0.2.2
47-
, cardano-ledger-core ^>= 1.18
47+
, cardano-ledger-core ^>= 1.19
4848
, cardano-node ^>= 10.5
4949
, cardano-prelude
5050
, containers
@@ -88,5 +88,5 @@ test-suite chairman-tests
8888
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
8989

9090
build-tool-depends: cardano-node:cardano-node
91-
, cardano-cli:cardano-cli ^>= 10.12
91+
, cardano-cli:cardano-cli ^>= 10.13
9292
, cardano-node-chairman:cardano-node-chairman

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ import Numeric (showFFloat)
5858
import Data.Void (absurd)
5959
import Data.Typeable (cast)
6060
import Data.Typeable (Typeable)
61+
import Ouroboros.Consensus.Peras.SelectView
6162

6263
-- {-# ANN module ("HLint: ignore Redundant bracket" :: Text) #-}
6364

@@ -109,6 +110,8 @@ instance ( LogFormatting (Header blk)
109110
"Chain Selection was starved."
110111
ChainDB.ChainSelStarvation (FallingEdgeWith pt) ->
111112
"Chain Selection was unstarved by " <> renderRealPoint pt
113+
forHuman (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
114+
forHuman (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
112115

113116
forMachine _ ChainDB.TraceLastShutdownUnclean =
114117
mconcat [ "kind" .= String "LastShutdownUnclean" ]
@@ -138,6 +141,9 @@ instance ( LogFormatting (Header blk)
138141
forMachine details v
139142
forMachine details (ChainDB.TraceVolatileDBEvent v) =
140143
forMachine details v
144+
forMachine _ (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
145+
forMachine _ (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
146+
141147

142148
asMetrics ChainDB.TraceLastShutdownUnclean = []
143149
asMetrics (ChainDB.TraceChainSelStarvationEvent _) = []
@@ -151,6 +157,8 @@ instance ( LogFormatting (Header blk)
151157
asMetrics (ChainDB.TraceLedgerDBEvent v) = asMetrics v
152158
asMetrics (ChainDB.TraceImmutableDBEvent v) = asMetrics v
153159
asMetrics (ChainDB.TraceVolatileDBEvent v) = asMetrics v
160+
asMetrics (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
161+
asMetrics (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
154162

155163

156164
instance MetaTrace (ChainDB.TraceEvent blk) where
@@ -178,6 +186,8 @@ instance MetaTrace (ChainDB.TraceEvent blk) where
178186
nsPrependInner "ImmDbEvent" (namespaceFor ev)
179187
namespaceFor (ChainDB.TraceVolatileDBEvent ev) =
180188
nsPrependInner "VolatileDbEvent" (namespaceFor ev)
189+
namespaceFor (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
190+
namespaceFor (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
181191

182192
severityFor (Namespace _ ["LastShutdownUnclean"]) _ = Just Info
183193
severityFor (Namespace _ ["ChainSelStarvationEvent"]) _ = Just Debug
@@ -497,10 +507,10 @@ instance ( LogFormatting (Header blk)
497507
in mconcat $
498508
[ "kind" .= String "AddedToCurrentChain"
499509
, "newtip" .= renderPointForDetails DDetailed (AF.headPoint extended)
500-
, "newTipSelectView" .= forMachine DDetailed (ChainDB.newTipSelectView selChangedInfo)
510+
, "newSuffixSelectView" .= forMachine DDetailed (ChainDB.newSuffixSelectView selChangedInfo)
501511
]
502-
++ [ "oldTipSelectView" .= forMachine DDetailed oldTipSelectView
503-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
512+
++ [ "oldSuffixSelectView" .= forMachine DDetailed oldSuffixSelectView
513+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
504514
]
505515
++ [ "headers" .= toJSON (forMachine DDetailed `map` addedHdrsNewChain base extended)
506516
]
@@ -513,10 +523,10 @@ instance ( LogFormatting (Header blk)
513523
mconcat $
514524
[ "kind" .= String "AddedToCurrentChain"
515525
, "newtip" .= renderPointForDetails dtal (AF.headPoint extended)
516-
, "newTipSelectView" .= forMachine dtal (ChainDB.newTipSelectView selChangedInfo)
526+
, "newSuffixSelectView" .= forMachine dtal (ChainDB.newSuffixSelectView selChangedInfo)
517527
]
518-
++ [ "oldTipSelectView" .= forMachine dtal oldTipSelectView
519-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
528+
++ [ "oldSuffixSelectView" .= forMachine dtal oldSuffixSelectView
529+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
520530
]
521531
++ [ "events" .= toJSON (map (forMachine dtal) events)
522532
| not (null events) ]
@@ -532,10 +542,10 @@ instance ( LogFormatting (Header blk)
532542
in mconcat $
533543
[ "kind" .= String "TraceAddBlockEvent.SwitchedToAFork"
534544
, "newtip" .= renderPointForDetails DDetailed (AF.headPoint new)
535-
, "newTipSelectView" .= forMachine DDetailed (ChainDB.newTipSelectView selChangedInfo)
545+
, "newSuffixSelectView" .= forMachine DDetailed (ChainDB.newSuffixSelectView selChangedInfo)
536546
]
537-
++ [ "oldTipSelectView" .= forMachine DDetailed oldTipSelectView
538-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
547+
++ [ "oldSuffixSelectView" .= forMachine DDetailed oldSuffixSelectView
548+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
539549
]
540550
++ [ "headers" .= toJSON (forMachine DDetailed `map` addedHdrsNewChain old new)
541551
]
@@ -548,10 +558,10 @@ instance ( LogFormatting (Header blk)
548558
mconcat $
549559
[ "kind" .= String "TraceAddBlockEvent.SwitchedToAFork"
550560
, "newtip" .= renderPointForDetails dtal (AF.headPoint new)
551-
, "newTipSelectView" .= forMachine dtal (ChainDB.newTipSelectView selChangedInfo)
561+
, "newSuffixSelectView" .= forMachine dtal (ChainDB.newSuffixSelectView selChangedInfo)
552562
]
553-
++ [ "oldTipSelectView" .= forMachine dtal oldTipSelectView
554-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
563+
++ [ "oldSuffixSelectView" .= forMachine dtal oldSuffixSelectView
564+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
555565
]
556566
++ [ "events" .= toJSON (map (forMachine dtal) events)
557567
| not (null events) ]
@@ -2906,3 +2916,6 @@ instance (Show (PBFT.PBftVerKeyHash c))
29062916
[ "kind" .= String "PBftCannotForgeThresholdExceeded"
29072917
, "numForged" .= numForged
29082918
]
2919+
2920+
instance LogFormatting (WeightedSelectView proto) where -- TODO @amesgen
2921+
forMachine _ _ = undefined

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

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
module Cardano.Tracing.OrphanInstances.Consensus () where
2121

22+
import Ouroboros.Consensus.Peras.SelectView
2223
import Cardano.Node.Tracing.Tracers.ConsensusStartupException
2324
(ConsensusStartupException (..))
2425
import Cardano.Prelude (Typeable, maximumDef)
@@ -174,7 +175,6 @@ instance HasSeverityAnnotation (ChainDB.TraceEvent blk) where
174175
ChainDB.PoppedReprocessLoEBlocksFromQueue -> Debug
175176
ChainDB.ChainSelectionLoEDebug _ _ -> Debug
176177

177-
178178
getSeverityAnnotation (ChainDB.TraceLedgerDBEvent ev) = case ev of
179179
LedgerDB.LedgerDBSnapshotEvent ev' -> case ev' of
180180
LedgerDB.TookSnapshot {} -> Info
@@ -252,6 +252,9 @@ instance HasSeverityAnnotation (ChainDB.TraceEvent blk) where
252252

253253
getSeverityAnnotation ChainDB.TraceChainSelStarvationEvent{} = Debug
254254

255+
getSeverityAnnotation (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
256+
getSeverityAnnotation (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
257+
255258
instance HasSeverityAnnotation (LedgerEvent blk) where
256259
getSeverityAnnotation (LedgerUpdate _) = Notice
257260
getSeverityAnnotation (LedgerWarning _) = Critical
@@ -785,10 +788,14 @@ instance ( ConvertRawHash blk
785788
ChainDB.TraceChainSelStarvationEvent ev -> case ev of
786789
ChainDB.ChainSelStarvation RisingEdge -> "Chain Selection was starved."
787790
ChainDB.ChainSelStarvation (FallingEdgeWith pt) -> "Chain Selection was unstarved by " <> renderRealPoint pt
791+
ChainDB.TracePerasCertDbEvent _ -> undefined -- TODO @amesgen
792+
ChainDB.TraceAddPerasCertEvent _ -> undefined -- TODO @amesgen
788793
where showProgressT :: Int -> Int -> Text
789794
showProgressT chunkNo outOf =
790795
pack (showFFloat (Just 2) (100 * fromIntegral chunkNo / fromIntegral outOf :: Float) mempty)
791796

797+
798+
792799
--
793800
-- | instances of @ToObject@
794801
--
@@ -971,10 +978,10 @@ instance ( ConvertRawHash blk
971978
[ "kind" .= String "TraceAddBlockEvent.AddedToCurrentChain"
972979
, "newtip" .= renderPointForVerbosity verb (AF.headPoint extended)
973980
, "chainLengthDelta" .= extended `chainLengthΔ` base
974-
, "newTipSelectView" .= toObject verb (ChainDB.newTipSelectView selChangedInfo)
981+
, "newSuffixSelectView" .= toObject verb (ChainDB.newSuffixSelectView selChangedInfo)
975982
]
976-
++ [ "oldTipSelectView" .= toObject verb oldTipSelectView
977-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
983+
++ [ "oldSuffixSelectView" .= toObject verb oldSuffixSelectView
984+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
978985
]
979986
++ [ "headers" .= toJSON (toObject verb `map` addedHdrsNewChain base extended)
980987
| verb == MaximalVerbosity ]
@@ -987,10 +994,10 @@ instance ( ConvertRawHash blk
987994
, "chainLengthDelta" .= new `chainLengthΔ` old
988995
-- Check that the SwitchedToAFork event was triggered by a proper fork.
989996
, "realFork" .= not (AF.withinFragmentBounds (AF.headPoint old) new)
990-
, "newTipSelectView" .= toObject verb (ChainDB.newTipSelectView selChangedInfo)
997+
, "newSuffixSelectView" .= toObject verb (ChainDB.newSuffixSelectView selChangedInfo)
991998
]
992-
++ [ "oldTipSelectView" .= toObject verb oldTipSelectView
993-
| Just oldTipSelectView <- [ChainDB.oldTipSelectView selChangedInfo]
999+
++ [ "oldSuffixSelectView" .= toObject verb oldSuffixSelectView
1000+
| Just oldSuffixSelectView <- [ChainDB.oldSuffixSelectView selChangedInfo]
9941001
]
9951002
++ [ "headers" .= toJSON (toObject verb `map` addedHdrsNewChain old new)
9961003
| verb == MaximalVerbosity ]
@@ -1065,6 +1072,9 @@ instance ( ConvertRawHash blk
10651072
chainLengthΔ :: AF.AnchoredFragment (Header blk) -> AF.AnchoredFragment (Header blk) -> Int
10661073
chainLengthΔ = on (-) (fromWithOrigin (-1) . fmap (fromIntegral . unBlockNo) . AF.headBlockNo)
10671074

1075+
toObject _verb (ChainDB.TracePerasCertDbEvent _) = undefined -- TODO @amesgen
1076+
toObject _verb (ChainDB.TraceAddPerasCertEvent _) = undefined -- TODO @amesgen
1077+
10681078
toObject MinimalVerbosity (ChainDB.TraceLedgerDBEvent _ev) = mempty -- no output
10691079
toObject verb (ChainDB.TraceLedgerDBEvent ev) = case ev of
10701080
LedgerDB.LedgerDBSnapshotEvent ev' -> case ev' of
@@ -1457,6 +1467,9 @@ instance ( LedgerSupportsProtocol blk,
14571467
, "theirFragment" .= toJSON ((tipToObject . tipFromHeader) `map` AF.toOldestFirst (ChainSync.Client.jTheirFragment info))
14581468
]
14591469

1470+
instance ToObject (WeightedSelectView proto) where -- TODO @amesgen
1471+
toObject _ _ = undefined
1472+
14601473
instance HasPrivacyAnnotation (ChainSync.Client.TraceEventCsj peer blk) where
14611474
instance HasSeverityAnnotation (ChainSync.Client.TraceEventCsj peer blk) where
14621475
getSeverityAnnotation _ = Debug

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, bytestring
4242
, cardano-api ^>= 10.19
4343
, cardano-binary
44-
, cardano-cli ^>= 10.12
44+
, cardano-cli ^>= 10.13
4545
, cardano-crypto-class ^>= 2.2
4646
, http-media
4747
, iohk-monitoring

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ library
4141
, ansi-terminal
4242
, bytestring
4343
, cardano-api ^>= 10.19
44-
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.12
44+
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.13
4545
, cardano-crypto-class
4646
, cardano-crypto-wrapper
4747
, cardano-git-rev ^>= 0.2.2

0 commit comments

Comments
 (0)