From f82a56326b42cbccfbdc1dbd87de3710339df685 Mon Sep 17 00:00:00 2001
From: Lukasz Rzasik <lukasz.rzasik@gmail.com>
Date: Thu, 12 Dec 2024 14:15:15 +0100
Subject: [PATCH] An epoch should not increment without view being incremented
 as well

---
 crates/task-impls/src/transactions.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crates/task-impls/src/transactions.rs b/crates/task-impls/src/transactions.rs
index e2d1154981..1ed7941524 100644
--- a/crates/task-impls/src/transactions.rs
+++ b/crates/task-impls/src/transactions.rs
@@ -479,7 +479,7 @@ impl<TYPES: NodeType, I: NodeImplementation<TYPES>, V: Versions> TransactionTask
                     *epoch
                 };
                 ensure!(
-                    *view > *self.cur_view || *epoch > *self.cur_epoch,
+                    *view > *self.cur_view && *epoch >= *self.cur_epoch,
                     debug!(
                       "Received a view change to an older view and epoch: tried to change view to {:?}\
                       and epoch {:?} though we are at view {:?} and epoch {:?}",