Made the replicas track the total amount of sequences

Author: Antoni Nowakowski

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/TendermintReplica.java

@@ -28,6 +28,8 @@ public class TendermintReplica extends LeaderBasedProtocolReplica {
     // Sequence: the current sequence within the height, where multiple sequences might be needed to finalize a block
     private long sequence;
 
+    private long totalSequences;
+
     // Step: the current step within the sequence (PROPOSE, PREVOTE, PRECOMMIT)
     private Step step;
 
@@ -68,6 +70,7 @@ public TendermintReplica(String nodeId, SortedSet<String> nodeIds, Scenario scen
         super(nodeId, scenario, new TotalOrderCommitLog());
         this.height = 0;
         this.sequence = 0;
+        this.totalSequences = 0;
         this.step = Step.PROPOSE;
         this.lockedValue = null;
         this.lockedSequence = -1;
@@ -293,6 +296,7 @@ private void executeProposalPrecommitRule(Block block) {
             //53: reset lockedRoundp, lockedV aluep, validRoundp and validV aluep to initial values and empty message log
             //54: StartRound(0)
             commitOperation(block);
+            this.totalSequences += this.sequence + 1;
             ReplyMessage replyMessage = new ReplyMessage(
                     this.height,
                     block.getRequestMessage().getTimestamp(),
@@ -315,7 +319,7 @@ protected void broadcastProposal(long height, long sequence, Block proposal, lon
         if(hasBroadcasted.contains(Pair.of(height, sequence))) {
             return;
         }
-        ProposalMessage proposalMessage = new ProposalMessage(getId(), height, sequence, validSequence, proposal);
+        ProposalMessage proposalMessage = new ProposalMessage(getId(), height, sequence, totalSequences, validSequence, proposal);
         broadcastMessageIncludingSelf(proposalMessage);
         hasBroadcasted.add(Pair.of(height, sequence));
 
@@ -488,7 +492,7 @@ private void broadcastGossipPrevote(PrevoteMessage prevoteMessage) {
 
     private void broadcastPrevote(long height, long sequence, Block block) {
 //        messageLog.sentPrevote();
-        PrevoteMessage prevoteMessage = new PrevoteMessage(height, sequence, this.getId(), block);
+        PrevoteMessage prevoteMessage = new PrevoteMessage(height, sequence, totalSequences, this.getId(), block);
         broadcastMessageIncludingSelf(prevoteMessage);
     }
 
@@ -609,7 +613,7 @@ private void broadcastGossipPrecommit(PrecommitMessage precommitMessage) {
     }
 
     protected void broadcastPrecommit(long height, long sequence, Block block) {
-        PrecommitMessage precommitMessage = new PrecommitMessage(height, sequence, this.getId(), block);
+        PrecommitMessage precommitMessage = new PrecommitMessage(height, sequence, totalSequences, this.getId(), block);
         broadcastMessageIncludingSelf(precommitMessage);
     }
 

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/message/GossipMessage.java

@@ -21,6 +21,6 @@ public String getType() {
 
     @Override
     public long getRound() {
-        return gossipMessage.getRound();
+        return 0;
     }
 }

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/message/PrecommitMessage.java

@@ -10,6 +10,7 @@
 public class PrecommitMessage extends GenericMessage {
     private final long height;      // Current blockchain height
     private final long sequence;       // Current round in the consensus process
+    private final long totalSeq;
     private final String replicaId; // ID of the validator sending the precommit
     private final Block block;
 
@@ -25,6 +26,6 @@ public String getAuthor() {
 
     @Override
     public long getRound() {
-        return sequence * 3 + 3;
+        return totalSeq + 3;
     }
 }

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/message/PrevoteMessage.java

@@ -10,6 +10,7 @@
 public class PrevoteMessage extends GenericMessage {
     private final long height;      // Current blockchain height
     private final long sequence;       // Current round in the consensus process
+    private final long totalSeq;
     private final String replicaId; // ID of the validator sending the prevote
     private final Block block;      // Block being prevoted
 
@@ -24,7 +25,7 @@ public String getAuthor() {
     }
 
     @Override
-    public long getRound(){
-        return sequence * 3 + 2;
+    public long getRound() {
+        return totalSeq + 2;
     }
 }

simulator/src/main/java/byzzbench/simulator/protocols/tendermint/message/ProposalMessage.java

@@ -11,6 +11,7 @@ public class ProposalMessage extends GenericMessage {
     private final String replicaId; // ID of the proposer
     private final long height; // Current blockchain height
     private final long sequence; // Current round in the consensus process
+    private final long totalSeq;
     private final long validSequence; // Round in which the value is valid
     private final Block block; // Block being proposed\
 
@@ -26,6 +27,6 @@ public String getAuthor() {
 
     @Override
     public long getRound() {
-        return sequence * 3 + 1;
+        return totalSeq + 1;
     }
 }