Skip to content

Commit cce4d73

Browse files
jasagredojasagredo
committed
Update deps, complete tracers
1 parent a245119 commit cce4d73

File tree

9 files changed

+90
-74
lines changed

9 files changed

+90
-74
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ library
8282
-- IOG dependencies
8383
--------------------------
8484
build-depends:
85-
, cardano-api ^>=10.19
85+
, cardano-api ^>=10.20
8686
, plutus-ledger-api ^>=1.53
8787
, plutus-tx ^>=1.53
8888
, plutus-tx-plugin ^>=1.53

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ library
111111
, attoparsec-aeson
112112
, base16-bytestring
113113
, bytestring
114-
, cardano-api ^>= 10.19
114+
, cardano-api ^>= 10.20
115115
, cardano-binary
116116
, cardano-cli ^>= 10.13
117117
, cardano-crypto-class

‎cabal.project‎

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,23 +67,23 @@ allow-newer:
6767
source-repository-package
6868
type: git
6969
location: https://github.com/intersectmbo/cardano-cli.git
70-
tag: 86ccb5dae44af6f085b594a9f7b516f1e2345d28
71-
--sha256: sha256-sCYz2MEQ51YERL99iXN+rf0TXXz3FD13Pv+AYT/2RSo=
70+
tag: 99e5c3f9e3aa3c1668bbe6890dccfdd6d1e3198e
71+
--sha256: sha256-gCqCSqeB5Rc1C+U0yJqduug89EHJdeA/7TO3rsIKEZs=
7272
subdir: cardano-cli
7373

7474
source-repository-package
7575
type: git
7676
location: https://github.com/IntersectMBO/cardano-api
77-
tag: c03ca3c768e21ec2c6f5761af5007894116fd8ac
78-
--sha256: sha256-8tcpe3UyqoEy+IUaBZ8UaWB4X5gvox+2/h3ccxxaNjs=
77+
tag: 431a81e7d50fa398ceb0c0e47fff2bf97b4840eb
78+
--sha256: sha256-2u6kkEQqaRDDFnRlVMTKJLAei5rFB4F78u3tagc7cVU=
7979
subdir:
8080
cardano-api
8181

8282
source-repository-package
8383
type: git
8484
location: https://github.com/IntersectMBO/ouroboros-consensus
85-
tag: d14d43e6582da900a75cb97c5c4d0292d232052f
86-
--sha256: sha256-Zn9gnpR9JnWcs0X4xUAWgJVzmTHjTHdn7uLwKw7erwQ=
85+
tag: 02c612b9bd19352940ad516639cc48867a6c3487
86+
--sha256: sha256-hWYtokcmTcjxuAW1nXF+nj9RtRp+OfT6i1HtJLoE4pA=
8787
subdir:
8888
ouroboros-consensus
8989
ouroboros-consensus-cardano
@@ -121,10 +121,19 @@ source-repository-package
121121

122122
-- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161
123123
source-repository-package
124-
type: git
125-
location: https://github.com/IntersectMBO/ouroboros-network
126-
tag: 1385b53cefb81e79553b6b0252537455833ea9c4
127-
--sha256: sha256-zZ7WsMfRs1fG16bmvI5vIh4fhQ8RGyEvYGLSWlrxpg0=
128-
subdir:
129-
ouroboros-network-api
130-
ouroboros-network
124+
type: git
125+
location: https://github.com/IntersectMBO/ouroboros-network
126+
tag: dfcb1f9c578ec8cd5114fea9696e7be6c9001323
127+
--sha256: sha256-omXPdi/T/f3gq9rOH20zX+x3WvaxlB704g07RF/13Nk=
128+
subdir:
129+
ouroboros-network-api
130+
ouroboros-network
131+
132+
source-repository-package
133+
type: git
134+
location: https://github.com/IntersectMBO/lsm-tree
135+
tag: 96474ce9559573698095229d8d08bd1a95b7ae01
136+
--sha256: sha256-5Tk4kVP6U0MuPHjRNal9XFFz6TgHBoFOhGCzEYrV3v4=
137+
subdir:
138+
lsm-tree
139+
blockio

‎cardano-node/cardano-node.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ library
141141
, async
142142
, base16-bytestring
143143
, bytestring
144-
, cardano-api ^>= 10.19
144+
, cardano-api ^>= 10.20
145145
, cardano-crypto-class
146146
, cardano-crypto-wrapper
147147
, cardano-git-rev ^>=0.2.2

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1073,8 +1073,14 @@ instance
10731073
, LogFormatting (PredicateFailure (Ledger.EraRule "CERTS" era))
10741074
) => LogFormatting (Conway.ConwayLedgerPredFailure era) where
10751075
forMachine v (Conway.ConwayUtxowFailure f) = forMachine v f
1076-
forMachine _verb (Conway.ConwayWithdrawalsMissingAccounts _) = mconcat [ "todo" .= String "todo"]
1077-
forMachine _verb (Conway.ConwayIncompleteWithdrawals _) = mconcat [ "todo" .= String "todo"]
1076+
forMachine _ (Conway.ConwayWithdrawalsMissingAccounts missingWithdrawals) =
1077+
mconcat [ "kind" .= String "ConwayWithdrawalsMissingAccounts"
1078+
, "withdrawals" .= unWithdrawals missingWithdrawals
1079+
]
1080+
forMachine _ (Conway.ConwayIncompleteWithdrawals incompleteWithdrawals) =
1081+
mconcat [ "kind" .= String "ConwayIncompleteWithdrawals"
1082+
, "withdrawals" .= unWithdrawals incompleteWithdrawals
1083+
]
10781084
forMachine _ (Conway.ConwayTxRefScriptsSizeTooBig Mismatch {mismatchSupplied, mismatchExpected}) =
10791085
mconcat [ "kind" .= String "ConwayTxRefScriptsSizeTooBig"
10801086
, "actual" .= mismatchSupplied

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

Lines changed: 47 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1874,29 +1874,43 @@ instance LogFormatting LedgerDB.TraceForkerEventWithKey where
18741874
"Forker " <> showT k <> ": " <> forHuman ev
18751875

18761876
instance LogFormatting LedgerDB.TraceForkerEvent where
1877-
forMachine _dtals LedgerDB.ForkerOpen = mempty
1878-
forMachine _dtals LedgerDB.ForkerCloseUncommitted = mempty
1879-
forMachine _dtals LedgerDB.ForkerCloseCommitted = mempty
1880-
forMachine _dtals LedgerDB.ForkerReadTablesStart = mempty
1881-
forMachine _dtals LedgerDB.ForkerReadTablesEnd = mempty
1882-
forMachine _dtals LedgerDB.ForkerRangeReadTablesStart = mempty
1883-
forMachine _dtals LedgerDB.ForkerRangeReadTablesEnd = mempty
1877+
forMachine _dtals LedgerDB.ForkerOpen =
1878+
mconcat [ "kind" .= String "ForkerOpen" ]
1879+
forMachine _dtals (LedgerDB.ForkerReadTables e) =
1880+
mconcat [ "kind" .= String "ForkerReadTables"
1881+
, "edge" .= case e of
1882+
RisingEdge -> String "RisingEdge"
1883+
FallingEdgeWith t -> toJSON t
1884+
]
1885+
forMachine _dtals (LedgerDB.ForkerRangeReadTables e) =
1886+
mconcat [ "kind" .= String "ForkerRangeReadTables"
1887+
, "edge" .= case e of
1888+
RisingEdge -> String "RisingEdge"
1889+
FallingEdgeWith t -> toJSON t
1890+
]
18841891
forMachine _dtals LedgerDB.ForkerReadStatistics = mempty
1885-
forMachine _dtals LedgerDB.ForkerPushStart = mempty
1886-
forMachine _dtals LedgerDB.ForkerPushEnd = mempty
1887-
forMachine _dtals LedgerDB.DanglingForkerClosed = mempty
1892+
forMachine _dtals (LedgerDB.ForkerPush e) =
1893+
mconcat [ "kind" .= String "ForkerPush"
1894+
, "edge" .= case e of
1895+
RisingEdge -> String "RisingEdge"
1896+
FallingEdgeWith t -> toJSON t
1897+
]
1898+
forMachine _dtals (LedgerDB.ForkerClose wc) =
1899+
mconcat [ "kind" .= String "ForkerClose"
1900+
, "wasCommitted" .= toJSON (wc == LedgerDB.ForkerWasCommitted)
1901+
]
18881902

18891903
forHuman LedgerDB.ForkerOpen = "Opened forker"
1890-
forHuman LedgerDB.ForkerCloseUncommitted = "Forker closed without committing"
1891-
forHuman LedgerDB.ForkerCloseCommitted = "Forker closed after committing"
1892-
forHuman LedgerDB.ForkerReadTablesStart = "Started to read tables"
1893-
forHuman LedgerDB.ForkerReadTablesEnd = "Finish reading tables"
1894-
forHuman LedgerDB.ForkerRangeReadTablesStart = "Started to range read tables"
1895-
forHuman LedgerDB.ForkerRangeReadTablesEnd = "Finish range reading tables"
1896-
forHuman LedgerDB.ForkerReadStatistics = "Gathering statistics"
1897-
forHuman LedgerDB.ForkerPushStart = "Started to push"
1898-
forHuman LedgerDB.ForkerPushEnd = "Pushed"
1899-
forHuman LedgerDB.DanglingForkerClosed = "Closed dangling forker"
1904+
forHuman (LedgerDB.ForkerReadTables RisingEdge) = "Forker reading tables"
1905+
forHuman (LedgerDB.ForkerReadTables (FallingEdgeWith t)) = "Forker read tables, took " <> showT t
1906+
forHuman (LedgerDB.ForkerRangeReadTables RisingEdge) = "Forker range reading tables"
1907+
forHuman (LedgerDB.ForkerRangeReadTables (FallingEdgeWith t)) = "Forker range read tables, took " <> showT t
1908+
forHuman LedgerDB.ForkerReadStatistics = "Forker gathering statistics"
1909+
forHuman (LedgerDB.ForkerPush RisingEdge) = "Forker pushing"
1910+
forHuman (LedgerDB.ForkerPush (FallingEdgeWith t)) = "Forker pushed, took " <> showT t
1911+
forHuman (LedgerDB.ForkerClose wc) = "Closed forker, " <> case wc of
1912+
LedgerDB.ForkerWasCommitted -> "was committed"
1913+
LedgerDB.ForkerWasUncommitted -> "was discarded"
19001914

19011915
instance MetaTrace LedgerDB.TraceForkerEventWithKey where
19021916
namespaceFor (LedgerDB.TraceForkerEventWithKey _ ev) =
@@ -1910,48 +1924,29 @@ instance MetaTrace LedgerDB.TraceForkerEventWithKey where
19101924

19111925
instance MetaTrace LedgerDB.TraceForkerEvent where
19121926
namespaceFor LedgerDB.ForkerOpen = Namespace [] ["Open"]
1913-
namespaceFor LedgerDB.ForkerCloseUncommitted = Namespace [] ["CloseUncommitted"]
1914-
namespaceFor LedgerDB.ForkerCloseCommitted = Namespace [] ["CloseCommitted"]
1915-
namespaceFor LedgerDB.ForkerReadTablesStart = Namespace [] ["StartRead"]
1916-
namespaceFor LedgerDB.ForkerReadTablesEnd = Namespace [] ["FinishRead"]
1917-
namespaceFor LedgerDB.ForkerRangeReadTablesStart = Namespace [] ["StartRangeRead"]
1918-
namespaceFor LedgerDB.ForkerRangeReadTablesEnd = Namespace [] ["FinishRangeRead"]
1927+
namespaceFor LedgerDB.ForkerReadTables{} = Namespace [] ["Read"]
1928+
namespaceFor LedgerDB.ForkerRangeReadTables{} = Namespace [] ["RangeRead"]
19191929
namespaceFor LedgerDB.ForkerReadStatistics = Namespace [] ["Statistics"]
1920-
namespaceFor LedgerDB.ForkerPushStart = Namespace [] ["StartPush"]
1921-
namespaceFor LedgerDB.ForkerPushEnd = Namespace [] ["FinishPush"]
1922-
namespaceFor LedgerDB.DanglingForkerClosed = Namespace [] ["DanglingForkerClosed"]
1930+
namespaceFor LedgerDB.ForkerPush{} = Namespace [] ["Push"]
1931+
namespaceFor LedgerDB.ForkerClose{} = Namespace [] ["Close"]
19231932

19241933
severityFor _ _ = Just Debug
19251934

1926-
documentFor (Namespace _ ("Open" : _tl)) = Just
1927-
"A forker is being opened"
1928-
documentFor (Namespace _ ("CloseUncommitted" : _tl)) = Just $
1929-
mconcat [ "A forker was closed without being committed."
1930-
, " This is usually the case with forkers that are not opened for chain selection,"
1931-
, " and for forkers on discarded forks"]
1932-
documentFor (Namespace _ ("CloseCommitted" : _tl)) = Just "A forker was committed (the LedgerDB was modified accordingly) and closed"
1933-
documentFor (Namespace _ ("StartRead" : _tl)) = Just "The process for reading ledger tables started"
1934-
documentFor (Namespace _ ("FinishRead" : _tl)) = Just "Values from the ledger tables were read"
1935-
documentFor (Namespace _ ("StartRangeRead" : _tl)) = Just "The process for range reading ledger tables started"
1936-
documentFor (Namespace _ ("FinishRangeRead" : _tl)) = Just "Values from the ledger tables were range-read"
1935+
documentFor (Namespace _ ("Open" : _tl)) = Just "A forker is being opened"
1936+
documentFor (Namespace _ ("Read" : _tl)) = Just "A forker is reading values"
1937+
documentFor (Namespace _ ("RangeRead" : _tl)) = Just "A forker is range reading values"
19371938
documentFor (Namespace _ ("Statistics" : _tl)) = Just "Statistics were gathered from the forker"
1938-
documentFor (Namespace _ ("StartPush" : _tl)) = Just "A ledger state is going to be pushed to the forker"
1939-
documentFor (Namespace _ ("FinishPush" : _tl)) = Just "A ledger state was pushed to the forker"
1940-
documentFor (Namespace _ ("DanglingForkerClosed" : _tl)) = Just "A dangling forker was closed"
1939+
documentFor (Namespace _ ("Push" : _tl)) = Just "A forker is pushing a new ledger state"
1940+
documentFor (Namespace _ ("Close" : _tl)) = Just "A forker was closed"
19411941
documentFor _ = Nothing
19421942

19431943
allNamespaces = [
19441944
Namespace [] ["Open"]
1945-
, Namespace [] ["CloseUncommitted"]
1946-
, Namespace [] ["CloseCommitted"]
1947-
, Namespace [] ["StartRead"]
1948-
, Namespace [] ["FinishRead"]
1949-
, Namespace [] ["StartRangeRead"]
1950-
, Namespace [] ["FinishRangeRead"]
1945+
, Namespace [] ["Read"]
1946+
, Namespace [] ["RangeRead"]
19511947
, Namespace [] ["Statistics"]
1952-
, Namespace [] ["StartPush"]
1953-
, Namespace [] ["FinishPush"]
1954-
, Namespace [] ["DanglingForkerClosed"]
1948+
, Namespace [] ["Push"]
1949+
, Namespace [] ["Close"]
19551950
]
19561951

19571952
--------------------------------------------------------------------------------

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

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,14 @@ instance
334334
, ToObject (PredicateFailure (Core.EraRule "GOV" ledgerera))
335335
) => ToObject (Conway.ConwayLedgerPredFailure ledgerera) where
336336
toObject verb (Conway.ConwayUtxowFailure f) = toObject verb f
337-
toObject _verb (Conway.ConwayWithdrawalsMissingAccounts _) = mconcat [ "todo" .= String "todo"]
338-
toObject _verb (Conway.ConwayIncompleteWithdrawals _) = mconcat [ "todo" .= String "todo"]
337+
toObject _ (Conway.ConwayWithdrawalsMissingAccounts missingWithdrawals) =
338+
mconcat [ "kind" .= String "ConwayWithdrawalsMissingAccounts"
339+
, "withdrawals" .= unWithdrawals missingWithdrawals
340+
]
341+
toObject _ (Conway.ConwayIncompleteWithdrawals incompleteWithdrawals) =
342+
mconcat [ "kind" .= String "ConwayIncompleteWithdrawals"
343+
, "withdrawals" .= unWithdrawals incompleteWithdrawals
344+
]
339345
toObject _ (Conway.ConwayTxRefScriptsSizeTooBig Mismatch {mismatchSupplied, mismatchExpected}) =
340346
mconcat [ "kind" .= String "ConwayTxRefScriptsSizeTooBig"
341347
, "actual" .= mismatchSupplied

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ library
3939
, aeson
4040
, async
4141
, bytestring
42-
, cardano-api ^>= 10.19
42+
, cardano-api ^>= 10.20
4343
, cardano-binary
4444
, cardano-cli ^>= 10.13
4545
, cardano-crypto-class ^>= 2.2

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ library
4040
, aeson-pretty
4141
, ansi-terminal
4242
, bytestring
43-
, cardano-api ^>= 10.19
43+
, cardano-api ^>= 10.20
4444
, cardano-cli:{cardano-cli, cardano-cli-test-lib} ^>= 10.13
4545
, cardano-crypto-class
4646
, cardano-crypto-wrapper

0 commit comments

Comments
 (0)