Skip to content

Update o-c and add tracer for LeiosTally #6670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
johnalotoski wants to merge 1 commit into
base: leios-prototype
Choose a base branch
from
+11 −3
Draft

Update o-c and add tracer for LeiosTally #6670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,12 +92,12 @@ allow-older:
-- Do NOT add more source-repository-package stanzas here unless they are strictly
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

-- Points to ouroboros-consensus/leios-prototype
-- Points to ouroboros-consensus/jl/leios-prototype-w35-patched
source-repository-package
type: git
location: https://github.com/IntersectMBO/ouroboros-consensus
tag: 1820edf5e496fbec5aa230a8bee56397c76f474b
--sha256: sha256-fKHnMyMNfPtVakRXQOEXpONh8AKNtxybaL3sMe6hdNw=
tag: bf1eeafff6f226affeb1de708f00a078a1657aa5
--sha256: sha256-uak6xmfDtKZSPhpkfCErYaaLU9ZpgDFQth52yOPRvzY=

-- Points to nfrisby-pr93-lookahead-merge-commit tag
source-repository-package
Expand Down
8 changes: 8 additions & 0 deletions cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2465,6 +2465,12 @@ instance LogFormatting TraceLeiosKernel where
"EB certified at slot " <> showT atSlot <> ": " <> Text.pack (show certifiedPoint)
TraceLeiosVoted{weight} -> "Leios voted, weight=" <> showT (fromRational @Double weight)
TraceLeiosVoteAcquired{} -> "Leios vote acquired"
TraceLeiosTally{rbHash, seatId, weight, tally, threshold} ->
"Leios tally for RB " <> Text.pack (show rbHash)
<> ": seat " <> showT (Leios.leiosSeatIndex seatId)
<> " added " <> showT (fromRational @Double weight)
<> ", now " <> showT (fromRational @Double tally)
<> " against a threshold of " <> showT (fromRational @Double threshold)
TraceLeiosCertified{rbHash} -> "Leios cert assembled for RB " <> Text.pack (show rbHash)
TraceLeiosVoteScheduled{ebPoint, voteIn, deadlineIn} ->
"Leios vote scheduled for " <> Text.pack (show ebPoint)
Expand Down Expand Up @@ -2529,6 +2535,7 @@ instance MetaTrace TraceLeiosKernel where
namespaceFor TraceLeiosBlockCertified{} = Namespace [] ["BlockCertified"]
namespaceFor TraceLeiosVoted{} = Namespace [] ["Voted"]
namespaceFor TraceLeiosVoteAcquired{} = Namespace [] ["VoteAcquired"]
namespaceFor TraceLeiosTally{} = Namespace [] ["Tally"]
namespaceFor TraceLeiosCertified{} = Namespace [] ["Certified"]
namespaceFor TraceLeiosNotVoted{} = Namespace [] ["NotVoted"]
namespaceFor TraceLeiosVoteScheduled{} = Namespace [] ["VoteScheduled"]
Expand Down Expand Up @@ -2578,6 +2585,7 @@ instance MetaTrace TraceLeiosKernel where
, Namespace [] ["BlockCertified"]
, Namespace [] ["Voted"]
, Namespace [] ["VoteAcquired"]
, Namespace [] ["Tally"]
, Namespace [] ["Certified"]
, Namespace [] ["NotVoted"]
, Namespace [] ["VoteScheduled"]
Expand Down
Loading