Skip to content
Merged
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions specifications/dag-consensus/Sailfish.tla
Original file line number Diff line number Diff line change
Expand Up @@ -127,16 +127,21 @@ l0: while (TRUE) {
}
else
with (delivered \in SUBSET {v \in vs : Round(v) = r-1}) {
\* Correct nodes check the following conditions and ignore the
\* message if they do not hold.
await IsQuorum({Node(v) : v \in delivered}); \* ignored otherwise
if (Leader(r) = self)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Between 129 and 130, add a comment that correct nodes check those conditions and ignore the message if they don't hold.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment clarifying that correct nodes check these conditions and ignore the message if they don't hold.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks

await \/ LeaderVertex(r-1) \in delivered
\/ NoLeaderVoteQuorum(r, {v \in vs : Round(v) = r}, {self});
vs := vs \cup {newV};
es := es \cup {<<newV, pv>> : pv \in delivered}
}
}
}
}
}*)
\* BEGIN TRANSLATION (chksum(pcal) = "c16dfa43" /\ chksum(tla) = "9cdbd4f5")
\* Label l0 of process correctNode at line 42 col 9 changed to l0_
\* BEGIN TRANSLATION (chksum(pcal) = "1dcb31ed" /\ chksum(tla) = "afe5b430")
\* Label l0 of process correctNode at line 73 col 9 changed to l0_
VARIABLES vs, es

(* define statement *)
Expand Down Expand Up @@ -195,6 +200,10 @@ byzantineNode(self) == /\ \E r \in R:
/\ es' = (es \cup {<<newV, Genesis>>})
ELSE /\ \E delivered \in SUBSET {v \in vs : Round(v) = r-1}:
/\ IsQuorum({Node(v) : v \in delivered})
/\ IF Leader(r) = self
THEN /\ \/ LeaderVertex(r-1) \in delivered
\/ NoLeaderVoteQuorum(r, {v \in vs : Round(v) = r}, {self})
ELSE /\ TRUE
/\ vs' = (vs \cup {newV})
/\ es' = (es \cup {<<newV, pv>> : pv \in delivered})
/\ UNCHANGED << round, log >>
Expand Down
Loading