fix: relax liveness check slightly

AleoNet · Sep 20, 2023 · 4599420 · 4599420
1 parent 5016ad0
commit 4599420
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/node/narwhal/src/helpers/storage.rs b/node/narwhal/src/helpers/storage.rs
@@ -313,10 +313,7 @@ impl<N: Network> Storage<N> {
         }
 
         // Check the timestamp for liveness.
-        check_timestamp_for_liveness(
-            batch_header.timestamp(),
-            self.median_timestamp_for_round(self.current_round() - 1),
-        )?;
+        check_timestamp_for_liveness(batch_header.timestamp(), self.median_timestamp_for_round(round - 1))?;
 
         // Initialize a list for the missing transmissions from storage.
         let mut missing_transmissions = HashMap::new();
@@ -419,7 +416,7 @@ impl<N: Network> Storage<N> {
         // Iterate over the timestamps.
         for timestamp in certificate.timestamps() {
             // Check the timestamp for liveness.
-            check_timestamp_for_liveness(timestamp, self.median_timestamp_for_round(self.current_round() - 1))?;
+            check_timestamp_for_liveness(timestamp, self.median_timestamp_for_round(round - 1))?;
         }
 
         // Retrieve the committee for the batch round.

diff --git a/node/narwhal/src/helpers/timestamp.rs b/node/narwhal/src/helpers/timestamp.rs
@@ -30,7 +30,7 @@ pub fn check_timestamp_for_liveness(timestamp: i64, previous_timestamp: i64) ->
     }
 
     // Ensure the timestamp is after the previous timestamp.
-    if timestamp <= previous_timestamp {
+    if timestamp < previous_timestamp {
         bail!(
             "Timestamp {timestamp} for the proposed batch must be after the previous round timestamp {previous_timestamp}"
         )