Stealing tracers from #6333

Author: jasagredo

cabal.project

@@ -67,23 +67,23 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/intersectmbo/cardano-cli.git
-  tag: 7bd43cbdb9f6602d907d9390afec96cd2610dc28
-  --sha256: 19ddnqkc1m1l9fcmr7jrx26qcgyidnddpkm9alfw33slvqsb2p4b
+  tag: 31a971727615cc2a7b2606aea684941e09b13e63
+  --sha256: sha256-ATAOoKnb4FuLOeIuqyz7V6yEV8kAqH9/dBauD9ep8U8=
   subdir: cardano-cli
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-api
-  tag: 7c4d6483f2eb49e4ce924333e55169cede3c9463
-  --sha256: 04ns5irf78fp3q5qrw8i2mra411aa4d8mwnx3x5fv85cx4mn5gw7
+  tag: eb3fd13407eb2b432b7f952c60c72326612c2381
+  --sha256: sha256-OWmSpbb45Vox9spaPumJ01WPnHr/bPW7OOlaj7iErYQ=
   subdir:
     cardano-api
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: d25313283097fc946ee4350c53155d3b7969c722
-  --sha256: 1rhxi1zrpmgqdxg2vin0ll57c6x3lh0j6xbf6vricx7x5q9rn7wc
+  tag: 39904b54069934756a9f36dc8ace9d0aff36c738
+  --sha256: sha256-J7M7g8bPuEAI8zIP5KoHFbWTkm1IZIFYN8dtFAPIKg8=
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano

cardano-node/src/Cardano/Node/TraceConstraints.hs

@@ -23,6 +23,7 @@ import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr, HasTxId
 import           Ouroboros.Consensus.Node.NetworkProtocolVersion
                    (HasNetworkProtocolVersion (BlockNodeToClientVersion, BlockNodeToNodeVersion))
 import           Ouroboros.Consensus.Node.Run (RunNode, SerialiseNodeToNodeConstraints)
+import           Ouroboros.Consensus.Peras.SelectView
 import           Ouroboros.Consensus.Protocol.Abstract (SelectView, ValidationErr)
 import           Ouroboros.Consensus.Shelley.Ledger.Mempool (GenTx, TxId)
 import           Ouroboros.Network.Block (Serialised)
@@ -51,7 +52,7 @@ type TraceConstraints blk =
     , ToObject (LedgerError blk)
     , ToObject (LedgerEvent blk)
     , ToObject (OtherHeaderEnvelopeError blk)
-    , ToObject (SelectView (BlockProtocol blk))
+    , ToObject (WeightedSelectView (BlockProtocol blk))
     , ToObject (ValidationErr (BlockProtocol blk))
     , ToObject (CannotForge blk)
     , ToObject (ForgeStateUpdateError blk)
@@ -66,7 +67,7 @@ type TraceConstraints blk =
     , LogFormatting (LedgerUpdate blk)
     , LogFormatting (LedgerWarning blk)
     , LogFormatting (OtherHeaderEnvelopeError blk)
-    , LogFormatting (SelectView (BlockProtocol blk))
+    , LogFormatting (WeightedSelectView (BlockProtocol blk))
     , LogFormatting (ValidationErr (BlockProtocol blk))
     , LogFormatting (CannotForge blk)
     , LogFormatting (ForgeStateUpdateError blk)

cardano-node/src/Cardano/Node/Tracing/Era/HardFork.hs

@@ -19,7 +19,7 @@ import           Cardano.Logging
 import           Cardano.Slotting.Slot (EpochSize (..))
 import           Cardano.Tracing.OrphanInstances.HardFork ()
 import           Ouroboros.Consensus.Block (BlockProtocol, CannotForge, ForgeStateInfo,
-                   ForgeStateUpdateError)
+                   ForgeStateUpdateError, PerasWeight (..))
 import           Ouroboros.Consensus.BlockchainTime (getSlotLength)
 import           Ouroboros.Consensus.Cardano.Condense ()
 import           Ouroboros.Consensus.HardFork.Combinator
@@ -36,7 +36,8 @@ import           Ouroboros.Consensus.HeaderValidation (OtherHeaderEnvelopeError)
 import           Ouroboros.Consensus.Ledger.Abstract (LedgerError)
 import           Ouroboros.Consensus.Ledger.Inspect (LedgerUpdate, LedgerWarning)
 import           Ouroboros.Consensus.Ledger.SupportsMempool (ApplyTxErr)
-import           Ouroboros.Consensus.Protocol.Abstract (ValidationErr, TiebreakerView, SelectView(..))
+import           Ouroboros.Consensus.Peras.SelectView
+import           Ouroboros.Consensus.Protocol.Abstract (TiebreakerView, ValidationErr)
 import           Ouroboros.Consensus.TypeFamilyWrappers
 import           Ouroboros.Consensus.Util.Condense (Condense (..))
 
@@ -352,10 +353,11 @@ instance LogFormatting (ForgeStateUpdateError blk) => LogFormatting (WrapForgeSt
 instance All (LogFormatting `Compose` WrapTiebreakerView) xs => LogFormatting (HardForkTiebreakerView xs) where
     forMachine dtal = forMachine dtal . getHardForkTiebreakerView
 
-instance LogFormatting (TiebreakerView protocol) => LogFormatting (SelectView protocol) where
+instance LogFormatting (TiebreakerView protocol) => LogFormatting (WeightedSelectView protocol) where
     forMachine dtal sv = mconcat
-        [ "blockNo"  .= svBlockNo sv
-        , forMachine dtal (svTiebreakerView sv)
+        [ "blockNo"  .= wsvBlockNo sv
+        , "weightBoost" .= unPerasWeight (wsvWeightBoost sv)
+        , forMachine dtal (wsvTiebreaker sv)
         ]
 
 instance All (LogFormatting `Compose` WrapTiebreakerView) xs => LogFormatting (OneEraTiebreakerView xs) where