Mutations, Termination, Logging, Bug fixes

Author: lubomarinski

simulator/src/main/java/byzzbench/simulator/config/ByzzBenchConfig.java

@@ -20,6 +20,8 @@
 @Data
 @Validated
 public class ByzzBenchConfig {
+    private boolean smallScope = true;
+
     /**
      * Whether to start generating scenarios on startup automatically.
      */

simulator/src/main/java/byzzbench/simulator/faults/ReplicaFault.java

@@ -0,0 +1,5 @@
+package byzzbench.simulator.faults;
+
+public interface ReplicaFault {
+    String getFaultyReplicaId();
+}

simulator/src/main/java/byzzbench/simulator/faults/RoundBasedFault.java

@@ -0,0 +1,5 @@
+package byzzbench.simulator.faults;
+
+public interface RoundBasedFault {
+    long getRound();
+}

simulator/src/main/java/byzzbench/simulator/faults/factories/ByzzFuzzScenarioFaultFactory.java

@@ -6,6 +6,7 @@
 import byzzbench.simulator.faults.FaultFactory;
 import byzzbench.simulator.faults.faults.ByzzFuzzNetworkFault;
 import byzzbench.simulator.faults.faults.ByzzFuzzProcessFault;
+import byzzbench.simulator.protocols.event_driven_hotstuff.EDHotStuffScenario;
 import byzzbench.simulator.scheduler.ByzzFuzzScheduler;
 import byzzbench.simulator.utils.SetSubsets;
 import org.springframework.stereotype.Component;
@@ -36,7 +37,7 @@ public List<Fault> generateFaults(FaultContext input) {
         int c = scheduler.getNumRoundsWithProcessFaults();
         int d = scheduler.getNumRoundsWithNetworkFaults();
         int r = scheduler.getNumRoundsWithFaults();
-        Set<String> nodeIds = scenario.getNodes().keySet();
+        Set<String> nodeIds = scenario.getReplicas().keySet();
 
         // Create network faults
         for (int i = 1; i <= d; i++) {
@@ -58,8 +59,14 @@ public List<Fault> generateFaults(FaultContext input) {
         }
 
         // Faults
-        System.out.println("ByzzFuzzFaults:");
-        faults.forEach(fault -> System.out.println(fault.getId()));
+        if(input.getScenario() instanceof EDHotStuffScenario edHotStuffScenario) {
+            edHotStuffScenario.log("ByzzFuzzFaults:");
+            faults.forEach(fault -> edHotStuffScenario.log(fault.getId()));
+        }
+        else {
+            System.out.println("ByzzFuzzFaults:");
+            faults.forEach(fault -> System.out.println(fault.getId()));
+        }
 
         return faults;
     }

simulator/src/main/java/byzzbench/simulator/faults/faults/ByzzFuzzNetworkFault.java

@@ -1,8 +1,10 @@
 package byzzbench.simulator.faults.faults;
 
 import byzzbench.simulator.faults.BaseFault;
+import byzzbench.simulator.faults.RoundBasedFault;
 import byzzbench.simulator.faults.behaviors.CreateNetworkPartitionsBehavior;
 import byzzbench.simulator.faults.predicates.MessageRoundPredicate;
+import lombok.Getter;
 
 import java.util.Set;
 
@@ -12,7 +14,10 @@
  * matches the round number of the fault, and the sender and receiver of the message
  * are not in the same partition, the message will be dropped.
  */
-public class ByzzFuzzNetworkFault extends BaseFault {
+public class ByzzFuzzNetworkFault extends BaseFault implements RoundBasedFault {
+
+    @Getter
+    private final long round;
     /**
      * Create a new ByzzFuzzNetworkFault
      *
@@ -25,5 +30,6 @@ public ByzzFuzzNetworkFault(Set<String> partition, int round) {
                 new MessageRoundPredicate(round),
                 new CreateNetworkPartitionsBehavior(partition)
         );
+        this.round = round;
     }
 }

simulator/src/main/java/byzzbench/simulator/faults/faults/ByzzFuzzProcessFault.java

@@ -1,10 +1,13 @@
 package byzzbench.simulator.faults.faults;
 
 import byzzbench.simulator.faults.BaseFault;
+import byzzbench.simulator.faults.ReplicaFault;
+import byzzbench.simulator.faults.RoundBasedFault;
 import byzzbench.simulator.faults.behaviors.MutateMessageBehavior;
 import byzzbench.simulator.faults.predicates.MessageRecipientHasIdPredicate;
 import byzzbench.simulator.faults.predicates.MessageRoundPredicate;
 import byzzbench.simulator.faults.predicates.MessageSenderHasIdPredicate;
+import lombok.Getter;
 
 import java.util.Set;
 
@@ -13,7 +16,13 @@
  * messages that contain a round number. If the message matches the sender, receiver and
  * round number of the fault, a random mutation is applied to the message.
  */
-public class ByzzFuzzProcessFault extends BaseFault {
+public class ByzzFuzzProcessFault extends BaseFault implements RoundBasedFault, ReplicaFault {
+
+    @Getter
+    private final long round;
+
+    private final String senderId;
+
     /**
      * Create a new ByzzFuzzProcessFault
      *
@@ -29,5 +38,11 @@ public ByzzFuzzProcessFault(Set<String> recipients, String sender, int round) {
                         .and(new MessageRecipientHasIdPredicate(recipients)),
                 new MutateMessageBehavior()
         );
+        this.round = round;
+        this.senderId = sender;
+    }
+
+    public String getFaultyReplicaId() {
+        return senderId;
     }
 }

simulator/src/main/java/byzzbench/simulator/protocols/event_driven_hotstuff/EDHSPacemaker.java

@@ -26,7 +26,7 @@ public EDHSPacemaker(EDHotStuffReplica replica, EDHSNode initialLeft, EDHSQuorum
     }
 
     public String getLeaderId(long viewNumber) {
-        int leaderIndex = (int) (viewNumber % (replica.getReplicaIds().size()));
+        int leaderIndex = (int) (Math.floor((double) viewNumber / 4) % (replica.getReplicaIds().size()));
 
         return replica.getReplicaIds().get(leaderIndex);
     }
@@ -57,9 +57,21 @@ public void updateHighQC(EDHSQuorumCertificate newQC) {
         }
     }
 
-    public void onNewViewQuorum() { onBeat(); }
-    public void onNewQC() { onBeat(); }
-    public void onClientRequest() { onBeat(); }
+    public void onNewViewQuorum() {
+        onBeat();
+
+        replica.log("PM: on NEW-VIEW quorum");
+    }
+    public void onNewQC() {
+        onBeat();
+
+        replica.log("PM: on new QC");
+    }
+    public void onClientRequest() {
+        onBeat();
+
+        replica.log("PM: on client request");
+    }
 
     private void onBeat() {
         try {
@@ -82,10 +94,11 @@ private void onBeat() {
     }
 
     public void onNextSyncView() {
+        replica.log("Next view sync timeout");
+
+        replica.increaseTimeout();
         replica.nextView();
         replica.sendMessage(new NewViewMessage(replica.getViewNumber(), highQC), getLeaderId());
-
-        replica.log("Next view sync timeout");
     }
 
     // NEW-VIEW

simulator/src/main/java/byzzbench/simulator/protocols/event_driven_hotstuff/EDHSScenarioState.java

@@ -0,0 +1,36 @@
+package byzzbench.simulator.protocols.event_driven_hotstuff;
+
+import lombok.Data;
+import lombok.Getter;
+import lombok.ToString;
+
+@Data
+public class EDHSScenarioState {
+    private boolean livenessViolation;
+    private boolean agreementViolation;
+    private long maxView;
+    private long minView;
+    private int commitedNodes;
+    private boolean validAssumptions;
+
+    public EDHSScenarioState() {
+        livenessViolation = false;
+        agreementViolation = false;
+        maxView = 0;
+        minView = 0;
+        commitedNodes = 0;
+        validAssumptions = true;
+    }
+
+    @Override
+    public String toString() {
+        return "EDHSScenarioState{" +
+                "livenessViolation=" + livenessViolation +
+                ", agreementViolation=" + agreementViolation +
+                ", maxView=" + maxView +
+                ", minView=" + minView +
+                ", commitedNodes=" + commitedNodes +
+                ", validAssumptions=" + validAssumptions +
+                '}';
+    }
+}