carry missed rounds over in rotateCapitalDistribution.

Author: drsk

concordium-consensus/src/Concordium/GlobalState/Persistent/PoolRewards.hs

@@ -21,6 +21,7 @@ module Concordium.GlobalState.Persistent.PoolRewards (
 ) where
 
 import Control.Exception (assert)
+import Data.Bool.Singletons
 import qualified Data.Map.Strict as Map
 import Data.Serialize
 import qualified Data.Vector as Vec
@@ -277,17 +278,30 @@ bakerBlockCounts PoolRewards{..} = do
 -- | Rotate the capital distribution, so that the current capital distribution is replaced by the
 --  next one, and set up empty pool rewards.
 rotateCapitalDistribution ::
+    forall av ref m bhv.
     (MonadBlobStore m, Reference m ref (PoolRewards bhv av), IsBlockHashVersion bhv, IsAccountVersion av) =>
     ref (PoolRewards bhv av) ->
     m (ref (PoolRewards bhv av))
 rotateCapitalDistribution oldPoolRewards = do
     pr <- refLoad oldPoolRewards
     nextCap <- refLoad (nextCapital pr)
+    oldBakerPoolRewardDetails <- LFMBT.toAscList $ bakerPoolRewardDetails pr
     rewardDetails <-
-        LFMBT.fromAscList $
-            replicate
-                (Vec.length (bakerPoolCapital nextCap))
-                emptyBakerPoolRewardDetails
+        case sSupportsValidatorSuspension (accountVersion @av) of
+            STrue -> do
+                LFMBT.fromAscList $
+                    -- Carry over the old missed rounds
+                    [ (emptyBakerPoolRewardDetails @av){missedRounds = missedRounds bprd}
+                      | bprd <- oldBakerPoolRewardDetails
+                    ]
+                        ++ replicate
+                            (Vec.length (bakerPoolCapital nextCap) - length oldBakerPoolRewardDetails)
+                            emptyBakerPoolRewardDetails
+            SFalse ->
+                LFMBT.fromAscList $
+                    replicate
+                        (Vec.length (bakerPoolCapital nextCap))
+                        emptyBakerPoolRewardDetails
     refMake $
         pr
             { currentCapital = nextCapital pr,