Update deps, complete tracers

Author: jasagredo

bench/plutus-scripts-bench/plutus-scripts-bench.cabal

@@ -82,7 +82,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api             ^>=10.19
+    , cardano-api             ^>=10.20
     , plutus-ledger-api       ^>=1.53
     , plutus-tx               ^>=1.53
     , plutus-tx-plugin        ^>=1.53

bench/tx-generator/tx-generator.cabal

@@ -111,7 +111,7 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.19
+                      , cardano-api ^>= 10.20
                       , cardano-binary
                       , cardano-cli ^>= 10.13
                       , cardano-crypto-class

cabal.project

@@ -13,7 +13,7 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2025-10-17T00:26:22Z
+  , hackage.haskell.org 2025-12-03T15:53:31Z
   , cardano-haskell-packages 2025-11-20T19:55:27Z
 
 packages:
@@ -67,23 +67,24 @@ allow-newer:
 source-repository-package
   type: git
   location: https://github.com/intersectmbo/cardano-cli.git
-  tag: 86ccb5dae44af6f085b594a9f7b516f1e2345d28
-  --sha256: sha256-sCYz2MEQ51YERL99iXN+rf0TXXz3FD13Pv+AYT/2RSo=
+  tag: 9bed9ca66fb4d0d7854e748c681d842bac202051
+  --sha256: sha256-7q/g7RHjO1sSW8RDiq47TpQccVOHOciDohgavH/g9t8=
   subdir: cardano-cli
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/cardano-api
-  tag: c03ca3c768e21ec2c6f5761af5007894116fd8ac
-  --sha256: sha256-8tcpe3UyqoEy+IUaBZ8UaWB4X5gvox+2/h3ccxxaNjs=
+  tag: 3d33855a5af6c6f2bb37b0c417f1ceb474ae079f
+  --sha256: sha256-zsEu8ZxF5/fLgokv/4kkII3j8/JbCvrnsHDueQyI6xI=
   subdir:
     cardano-api
 
 source-repository-package
   type: git
   location: https://github.com/IntersectMBO/ouroboros-consensus
-  tag: d14d43e6582da900a75cb97c5c4d0292d232052f
-  --sha256: sha256-Zn9gnpR9JnWcs0X4xUAWgJVzmTHjTHdn7uLwKw7erwQ=
+  tag: baf4ebbd924433543f8c5142b370b1061ac2e7bb
+  --sha256: sha256-dCNFxrLF7MPqNRc9aIwl2AZpjHqw9dGerTudo7GQzao=
+
   subdir:
     ouroboros-consensus
     ouroboros-consensus-cardano
@@ -121,10 +122,10 @@ source-repository-package
 
 -- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161
 source-repository-package
-   type: git
-   location: https://github.com/IntersectMBO/ouroboros-network
-   tag: 1385b53cefb81e79553b6b0252537455833ea9c4
-   --sha256: sha256-zZ7WsMfRs1fG16bmvI5vIh4fhQ8RGyEvYGLSWlrxpg0=
-   subdir:
-     ouroboros-network-api
-     ouroboros-network
+  type: git
+  location: https://github.com/IntersectMBO/ouroboros-network
+  tag: dfcb1f9c578ec8cd5114fea9696e7be6c9001323
+  --sha256: sha256-omXPdi/T/f3gq9rOH20zX+x3WvaxlB704g07RF/13Nk=
+  subdir:
+    ouroboros-network-api
+    ouroboros-network

cardano-node/cardano-node.cabal

@@ -141,7 +141,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 10.19
+                      , cardano-api ^>= 10.20
                       , cardano-crypto-class ^>=2.2.3.2
                       , cardano-crypto-wrapper
                       , cardano-git-rev ^>=0.2.2

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

@@ -1073,8 +1073,14 @@ instance
   , LogFormatting (PredicateFailure (Ledger.EraRule "CERTS" era))
   ) => LogFormatting (Conway.ConwayLedgerPredFailure era) where
   forMachine v (Conway.ConwayUtxowFailure f) = forMachine v f
-  forMachine _verb (Conway.ConwayWithdrawalsMissingAccounts _) = mconcat [ "todo" .= String "todo"]
-  forMachine _verb (Conway.ConwayIncompleteWithdrawals _) = mconcat [ "todo" .= String "todo"]
+  forMachine _ (Conway.ConwayWithdrawalsMissingAccounts missingWithdrawals) =
+    mconcat [ "kind" .= String "ConwayWithdrawalsMissingAccounts"
+            , "withdrawals" .= unWithdrawals missingWithdrawals
+            ]
+  forMachine _ (Conway.ConwayIncompleteWithdrawals incompleteWithdrawals) =
+    mconcat [ "kind" .= String "ConwayIncompleteWithdrawals"
+            , "withdrawals" .= unWithdrawals incompleteWithdrawals
+            ]
   forMachine _ (Conway.ConwayTxRefScriptsSizeTooBig  Mismatch {mismatchSupplied, mismatchExpected}) =
     mconcat [ "kind" .= String "ConwayTxRefScriptsSizeTooBig"
             , "actual" .= mismatchSupplied

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

@@ -1874,29 +1874,43 @@ instance LogFormatting LedgerDB.TraceForkerEventWithKey where
     "Forker " <> showT k <> ": " <> forHuman ev
 
 instance LogFormatting LedgerDB.TraceForkerEvent where
-  forMachine _dtals LedgerDB.ForkerOpen = mempty
-  forMachine _dtals LedgerDB.ForkerCloseUncommitted = mempty
-  forMachine _dtals LedgerDB.ForkerCloseCommitted = mempty
-  forMachine _dtals LedgerDB.ForkerReadTablesStart = mempty
-  forMachine _dtals LedgerDB.ForkerReadTablesEnd = mempty
-  forMachine _dtals LedgerDB.ForkerRangeReadTablesStart = mempty
-  forMachine _dtals LedgerDB.ForkerRangeReadTablesEnd = mempty
+  forMachine _dtals LedgerDB.ForkerOpen =
+    mconcat [ "kind" .= String "ForkerOpen" ]
+  forMachine _dtals (LedgerDB.ForkerReadTables e) =
+    mconcat [ "kind" .= String "ForkerReadTables"
+            , "edge" .= case e of
+                RisingEdge -> String "RisingEdge"
+                FallingEdgeWith t -> toJSON t
+            ]
+  forMachine _dtals (LedgerDB.ForkerRangeReadTables e) =
+    mconcat [ "kind" .= String "ForkerRangeReadTables"
+            , "edge" .= case e of
+                RisingEdge -> String "RisingEdge"
+                FallingEdgeWith t -> toJSON t
+            ]
   forMachine _dtals LedgerDB.ForkerReadStatistics = mempty
-  forMachine _dtals LedgerDB.ForkerPushStart = mempty
-  forMachine _dtals LedgerDB.ForkerPushEnd = mempty
-  forMachine _dtals LedgerDB.DanglingForkerClosed = mempty
+  forMachine _dtals (LedgerDB.ForkerPush e) =
+    mconcat [ "kind" .= String "ForkerPush"
+            , "edge" .= case e of
+                RisingEdge -> String "RisingEdge"
+                FallingEdgeWith t -> toJSON t
+            ]
+  forMachine _dtals (LedgerDB.ForkerClose wc) =
+    mconcat [ "kind" .= String "ForkerClose"
+            , "wasCommitted" .= toJSON (wc == LedgerDB.ForkerWasCommitted)
+            ]
 
   forHuman LedgerDB.ForkerOpen = "Opened forker"
-  forHuman LedgerDB.ForkerCloseUncommitted = "Forker closed without committing"
-  forHuman LedgerDB.ForkerCloseCommitted = "Forker closed after committing"
-  forHuman LedgerDB.ForkerReadTablesStart = "Started to read tables"
-  forHuman LedgerDB.ForkerReadTablesEnd = "Finish reading tables"
-  forHuman LedgerDB.ForkerRangeReadTablesStart = "Started to range read tables"
-  forHuman LedgerDB.ForkerRangeReadTablesEnd = "Finish range reading tables"
-  forHuman LedgerDB.ForkerReadStatistics = "Gathering statistics"
-  forHuman LedgerDB.ForkerPushStart = "Started to push"
-  forHuman LedgerDB.ForkerPushEnd = "Pushed"
-  forHuman LedgerDB.DanglingForkerClosed = "Closed dangling forker"
+  forHuman (LedgerDB.ForkerReadTables RisingEdge) = "Forker reading tables"
+  forHuman (LedgerDB.ForkerReadTables (FallingEdgeWith t)) = "Forker read tables, took " <> showT t
+  forHuman (LedgerDB.ForkerRangeReadTables RisingEdge) = "Forker range reading tables"
+  forHuman (LedgerDB.ForkerRangeReadTables (FallingEdgeWith t)) = "Forker range read tables, took " <> showT t
+  forHuman LedgerDB.ForkerReadStatistics = "Forker gathering statistics"
+  forHuman (LedgerDB.ForkerPush RisingEdge) = "Forker pushing"
+  forHuman (LedgerDB.ForkerPush (FallingEdgeWith t)) = "Forker pushed, took " <> showT t
+  forHuman (LedgerDB.ForkerClose wc) = "Closed forker, " <> case wc of
+    LedgerDB.ForkerWasCommitted -> "was committed"
+    LedgerDB.ForkerWasUncommitted -> "was discarded"
 
 instance MetaTrace LedgerDB.TraceForkerEventWithKey where
   namespaceFor (LedgerDB.TraceForkerEventWithKey _ ev) =
@@ -1910,48 +1924,29 @@ instance MetaTrace LedgerDB.TraceForkerEventWithKey where
 
 instance MetaTrace LedgerDB.TraceForkerEvent where
   namespaceFor LedgerDB.ForkerOpen = Namespace [] ["Open"]
-  namespaceFor LedgerDB.ForkerCloseUncommitted = Namespace [] ["CloseUncommitted"]
-  namespaceFor LedgerDB.ForkerCloseCommitted = Namespace [] ["CloseCommitted"]
-  namespaceFor LedgerDB.ForkerReadTablesStart = Namespace [] ["StartRead"]
-  namespaceFor LedgerDB.ForkerReadTablesEnd = Namespace [] ["FinishRead"]
-  namespaceFor LedgerDB.ForkerRangeReadTablesStart = Namespace [] ["StartRangeRead"]
-  namespaceFor LedgerDB.ForkerRangeReadTablesEnd = Namespace [] ["FinishRangeRead"]
+  namespaceFor LedgerDB.ForkerReadTables{} = Namespace [] ["Read"]
+  namespaceFor LedgerDB.ForkerRangeReadTables{} = Namespace [] ["RangeRead"]
   namespaceFor LedgerDB.ForkerReadStatistics = Namespace [] ["Statistics"]
-  namespaceFor LedgerDB.ForkerPushStart = Namespace [] ["StartPush"]
-  namespaceFor LedgerDB.ForkerPushEnd = Namespace [] ["FinishPush"]
-  namespaceFor LedgerDB.DanglingForkerClosed = Namespace [] ["DanglingForkerClosed"]
+  namespaceFor LedgerDB.ForkerPush{} = Namespace [] ["Push"]
+  namespaceFor LedgerDB.ForkerClose{} = Namespace [] ["Close"]
 
   severityFor _ _ = Just Debug
 
-  documentFor (Namespace _ ("Open" : _tl)) = Just
-   "A forker is being opened"
-  documentFor (Namespace _ ("CloseUncommitted" : _tl)) = Just $
-   mconcat [ "A forker was closed without being committed."
-           , " This is usually the case with forkers that are not opened for chain selection,"
-           , " and for forkers on discarded forks"]
-  documentFor (Namespace _ ("CloseCommitted" : _tl)) = Just "A forker was committed (the LedgerDB was modified accordingly) and closed"
-  documentFor (Namespace _ ("StartRead" : _tl)) = Just "The process for reading ledger tables started"
-  documentFor (Namespace _ ("FinishRead" : _tl)) = Just "Values from the ledger tables were read"
-  documentFor (Namespace _ ("StartRangeRead" : _tl)) = Just "The process for range reading ledger tables started"
-  documentFor (Namespace _ ("FinishRangeRead" : _tl)) = Just "Values from the ledger tables were range-read"
+  documentFor (Namespace _ ("Open" : _tl)) = Just "A forker is being opened"
+  documentFor (Namespace _ ("Read" : _tl)) = Just "A forker is reading values"
+  documentFor (Namespace _ ("RangeRead" : _tl)) = Just "A forker is range reading values"
   documentFor (Namespace _ ("Statistics" : _tl)) = Just "Statistics were gathered from the forker"
-  documentFor (Namespace _ ("StartPush" : _tl)) = Just "A ledger state is going to be pushed to the forker"
-  documentFor (Namespace _ ("FinishPush" : _tl)) = Just "A ledger state was pushed to the forker"
-  documentFor (Namespace _ ("DanglingForkerClosed" : _tl)) = Just "A dangling forker was closed"
+  documentFor (Namespace _ ("Push" : _tl)) = Just "A forker is pushing a new ledger state"
+  documentFor (Namespace _ ("Close" : _tl)) = Just "A forker was closed"
   documentFor _ = Nothing
 
   allNamespaces = [
       Namespace [] ["Open"]
-    , Namespace [] ["CloseUncommitted"]
-    , Namespace [] ["CloseCommitted"]
-    , Namespace [] ["StartRead"]
-    , Namespace [] ["FinishRead"]
-    , Namespace [] ["StartRangeRead"]
-    , Namespace [] ["FinishRangeRead"]
+    , Namespace [] ["Read"]
+    , Namespace [] ["RangeRead"]
     , Namespace [] ["Statistics"]
-    , Namespace [] ["StartPush"]
-    , Namespace [] ["FinishPush"]
-    , Namespace [] ["DanglingForkerClosed"]
+    , Namespace [] ["Push"]
+    , Namespace [] ["Close"]
     ]
 
 --------------------------------------------------------------------------------

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

@@ -334,8 +334,14 @@ instance
   , ToObject (PredicateFailure (Core.EraRule "GOV" ledgerera))
   ) => ToObject (Conway.ConwayLedgerPredFailure ledgerera) where
   toObject verb (Conway.ConwayUtxowFailure f) = toObject verb f
-  toObject _verb (Conway.ConwayWithdrawalsMissingAccounts _) = mconcat [ "todo" .= String "todo"]
-  toObject _verb (Conway.ConwayIncompleteWithdrawals _) = mconcat [ "todo" .= String "todo"]
+  toObject _ (Conway.ConwayWithdrawalsMissingAccounts missingWithdrawals) =
+    mconcat [ "kind" .= String "ConwayWithdrawalsMissingAccounts"
+            , "withdrawals" .= unWithdrawals missingWithdrawals
+            ]
+  toObject _ (Conway.ConwayIncompleteWithdrawals incompleteWithdrawals) =
+    mconcat [ "kind" .= String "ConwayIncompleteWithdrawals"
+            , "withdrawals" .= unWithdrawals incompleteWithdrawals
+            ]
   toObject _    (Conway.ConwayTxRefScriptsSizeTooBig Mismatch {mismatchSupplied, mismatchExpected}) =
     mconcat [ "kind" .= String "ConwayTxRefScriptsSizeTooBig"
             , "actual" .= mismatchSupplied

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

@@ -39,7 +39,7 @@ library
                       , aeson
                       , async
                       , bytestring
-                      , cardano-api ^>= 10.19
+                      , cardano-api ^>= 10.20
                       , cardano-binary
                       , cardano-cli ^>= 10.13
                       , cardano-crypto-class ^>=2.2.3.2

cardano-testnet/cardano-testnet.cabal

@@ -40,7 +40,7 @@ library
                       , aeson-pretty
                       , ansi-terminal
                       , bytestring
-                      , cardano-api ^>= 10.19
+                      , cardano-api ^>= 10.20
                       , cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.13
                       , cardano-crypto-class ^>=2.2.3.2
                       , cardano-crypto-wrapper