WIP: fix ledger stuff

Author: ana-pantilie

cardano-node/src/Cardano/Node/Protocol/Shelley.hs

@@ -259,11 +259,11 @@ mkPraosLeaderCredentials
     ShelleyLeaderCredentials
     { shelleyLeaderCredentialsCanBeLeader =
         PraosCanBeLeader {
-        praosCanBeLeaderOpCert     = opcert,
           praosCanBeLeaderColdVerKey = coerceKeyRole vkey,
-          praosCanBeLeaderSignKeyVRF = vrfKey
+          praosCanBeLeaderSignKeyVRF = vrfKey,
+          -- TODO: fix
+          praosCanBeLeaderCredentialsSource = undefined
         },
-      shelleyLeaderCredentialsInitSignKey = kesKey,
       shelleyLeaderCredentialsLabel = "Shelley"
     }
 

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

@@ -1475,7 +1475,7 @@ instance
               , "scripts" .= scripts
               ]
     -- TODO: fix
-    Conway.ScriptIntegrityHashMismatch _ -> undefined
+    Conway.ScriptIntegrityHashMismatch _ _ -> undefined
 
 --------------------------------------------------------------------------------
 -- Helper functions

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

@@ -399,8 +399,8 @@ instance ( LogFormatting (Header blk)
          , InspectLedger blk
          , HasIssuer blk
          ) => LogFormatting (ChainDB.TraceAddBlockEvent blk) where
-  forHuman (ChainDB.IgnoreBlockOlderThanK pt) =
-    "Ignoring block older than K: " <> renderRealPointAsPhrase pt
+  forHuman (ChainDB.IgnoreBlockOlderThanImmTip pt) =
+    "Ignoring block older than ImmTip: " <> renderRealPointAsPhrase pt
   forHuman (ChainDB.IgnoreBlockAlreadyInVolatileDB pt) =
       "Ignoring block already in DB: " <> renderRealPointAsPhrase pt
   forHuman (ChainDB.IgnoreInvalidBlock pt _reason) =
@@ -445,8 +445,8 @@ instance ( LogFormatting (Header blk)
       "Poppped request from queue to reprocess blocks postponed by LoE."
   forHuman ChainDB.ChainSelectionLoEDebug{} =
       "ChainDB LoE debug event"
-  forMachine dtal (ChainDB.IgnoreBlockOlderThanK pt) =
-      mconcat [ "kind" .= String "IgnoreBlockOlderThanK"
+  forMachine dtal (ChainDB.IgnoreBlockOlderThanImmTip pt) =
+      mconcat [ "kind" .= String "IgnoreBlockOlderThanImmTip"
                , "block" .= forMachine dtal pt ]
   forMachine dtal (ChainDB.IgnoreBlockAlreadyInVolatileDB pt) =
       mconcat [ "kind" .= String "IgnoreBlockAlreadyInVolatileDB"
@@ -625,8 +625,8 @@ instance ( LogFormatting (Header blk)
 
 
 instance MetaTrace  (ChainDB.TraceAddBlockEvent blk) where
-  namespaceFor ChainDB.IgnoreBlockOlderThanK {} =
-    Namespace [] ["IgnoreBlockOlderThanK"]
+  namespaceFor ChainDB.IgnoreBlockOlderThanImmTip {} =
+    Namespace [] ["IgnoreBlockOlderThanImmTip"]
   namespaceFor ChainDB.IgnoreBlockAlreadyInVolatileDB {} =
     Namespace [] ["IgnoreBlockAlreadyInVolatileDB"]
   namespaceFor ChainDB.IgnoreInvalidBlock {} =

cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs

@@ -2097,6 +2097,9 @@ instance ( LogFormatting selection
       GsmEventLeaveCaughtUp {}       -> [preSyncing]
       GsmEventPreSyncingToSyncing {} -> [syncing]
       GsmEventSyncingToPreSyncing {} -> [preSyncing]
+      -- TODO: fix
+      GsmEventInitializedInCaughtUp {}   -> undefined
+      GsmEventInitializedInPreSyncing {} -> undefined
     where
       preSyncing = IntM "GSM.state" 0
       syncing    = IntM "GSM.state" 1

cardano-node/src/Cardano/Tracing/OrphanInstances/Byron.hs

@@ -12,8 +12,7 @@ module Cardano.Tracing.OrphanInstances.Byron () where
 
 import           Cardano.Api (textShow)
 
-import           Ouroboros.Consensus.Protocol.Abstract (SelectView (..))
-import           Ouroboros.Consensus.Protocol.PBFT (PBft, PBftTiebreakerView(..))
+import           Ouroboros.Consensus.Protocol.PBFT (PBftTiebreakerView(..))
 import           Ouroboros.Consensus.Block.EBB (fromIsEBB)
 import           Cardano.Chain.Block (ABlockOrBoundaryHdr (..), AHeader (..),
                    ChainValidationError (..), delegationCertificate)

cardano-node/src/Cardano/Tracing/OrphanInstances/HardFork.hs

@@ -46,7 +46,6 @@ import           Ouroboros.Consensus.Node.NetworkProtocolVersion (BlockNodeToCli
 import           Ouroboros.Consensus.Protocol.Abstract (ValidationErr, SelectView (svTiebreakerView, svBlockNo), ConsensusProtocol (TiebreakerView))
 import           Ouroboros.Consensus.TypeFamilyWrappers
 import           Ouroboros.Consensus.Util.Condense (Condense (..))
-import Ouroboros.Consensus.Cardano (ProtocolByron)
 
 import           Data.Aeson
 import qualified Data.ByteString.Base16 as Base16