consensus: handle EBBs in rewindHeaderState

IntersectMBO · Feb 25, 2020 · b997eef · b997eef
1 parent ccc8eb1
commit b997eef
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/ouroboros-consensus/src/Ouroboros/Consensus/HeaderValidation.hs b/ouroboros-consensus/src/Ouroboros/Consensus/HeaderValidation.hs
@@ -201,12 +201,13 @@ rewindHeaderState cfg p HeaderState{..} = do
     chainState' <- rewindChainState (configConsensus cfg) headerStateChain p
     return $ HeaderState {
         headerStateChain  = chainState'
-      , headerStateTips   = Seq.dropWhileR rolledBack headerStateTips
+      , headerStateTips   = Seq.dropWhileR rollBack headerStateTips
       , headerStateAnchor = headerStateAnchor
       }
   where
-    rolledBack :: AnnTip blk -> Bool
-    rolledBack t = annTipPoint t > p
+    rollBack :: AnnTip blk -> Bool
+    rollBack t = At (annTipSlotNo t) > pointSlot p ||
+                (At (annTipSlotNo t) == pointSlot p && annTipPoint t /= p)
 
 {-------------------------------------------------------------------------------
   Validate header envelope