From fec580c39ccf7812155415be9bc1b5bd8d207942 Mon Sep 17 00:00:00 2001
From: Jacek Sieka <jacek@status.im>
Date: Fri, 3 Mar 2023 18:38:48 +0100
Subject: [PATCH] doppelganger: guard against reordering (#4691)

---
 beacon_chain/validators/validator_pool.nim | 33 ++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/beacon_chain/validators/validator_pool.nim b/beacon_chain/validators/validator_pool.nim
index 5421f8c5f..e01df536e 100644
--- a/beacon_chain/validators/validator_pool.nim
+++ b/beacon_chain/validators/validator_pool.nim
@@ -278,10 +278,18 @@ proc doppelgangerChecked*(validator: AttachedValidator, epoch: Epoch) =
   if validator.doppelCheck.isNone():
     debug "Doppelganger first check",
       validator = shortLog(validator), epoch
-  elif validator.doppelCheck.get() + 1 notin [epoch, epoch + 1]:
-    debug "Doppelganger stale check",
-      validator = shortLog(validator),
-      checked = validator.doppelCheck.get(), epoch
+  else:
+    let check = validator.doppelCheck.get()
+    if check > epoch:
+      # Shouldn't happen but due to `await`, it may - consider turning into
+      # assert
+      debug "Doppelganger reordered check",
+        validator = shortLog(validator), check, epoch
+      return
+
+    if check - epoch > 1:
+      debug "Doppelganger stale check",
+        validator = shortLog(validator), check, epoch
 
   validator.doppelCheck = Opt.some epoch
 
@@ -290,10 +298,19 @@ proc doppelgangerActivity*(validator: AttachedValidator, epoch: Epoch) =
   if validator.doppelActivity.isNone():
     debug "Doppelganger first activity",
       validator = shortLog(validator), epoch
-  elif validator.doppelActivity.get() + 1 notin [epoch, epoch + 1]:
-    debug "Doppelganger stale activity",
-      validator = shortLog(validator),
-      checked = validator.doppelActivity.get(), epoch
+  else:
+    let activity = validator.doppelActivity.get()
+    if activity > epoch:
+      # Shouldn't happen but due to `await`, it may - consider turning into
+      # assert
+      debug "Doppelganger reordered activity",
+        validator = shortLog(validator), activity, epoch
+      return
+
+    if activity - epoch > 1:
+      # We missed work in some epoch
+      debug "Doppelganger stale activity",
+        validator = shortLog(validator), activity, epoch
 
   validator.doppelActivity = Opt.some epoch