Merge pull request #1247 from input-output-hk/kderme/release-fix-stak…

…e-rollback

Fix stake address rollback | Release version

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Babbage.hs

@@ -77,6 +77,7 @@ unitTests iom knownMigrations =
           , test "sync bigger chain" bigChain
           , test "rollback while db-sync is off" restartAndRollback
           , test "rollback further" rollbackFurther
+          , test "rollback stake address cache" stakeAddressRollback
           ]
       , testGroup "different configs"
           [ test "genesis config without pool" configNoPools
@@ -323,6 +324,27 @@ rollbackFurther =
   where
     testLabel = "rollbackFurther"
 
+stakeAddressRollback :: IOManager -> [(Text, Text)] -> Assertion
+stakeAddressRollback =
+  withFullConfig babbageConfig testLabel $ \interpreter mockServer dbSync -> do
+    startDBSync  dbSync
+    blk <- forgeNextFindLeaderAndSubmit interpreter mockServer []
+    blk' <- withBabbageFindLeaderAndSubmit interpreter mockServer $ \st -> do
+      let poolId = resolvePool (PoolIndex 0) st
+      tx1 <- Babbage.mkSimpleDCertTx
+              [ (StakeIndexNew 1, DCertDeleg . RegKey)
+              , (StakeIndexNew 1, \stCred -> DCertDeleg $ Delegate $ Delegation stCred poolId) ]
+              st
+      Right [tx1]
+    assertBlockNoBackoff dbSync 2
+    atomically $ rollback mockServer (blockPoint blk)
+    assertBlockNoBackoff dbSync 1
+    atomically $ addBlock mockServer blk'
+    void $ forgeNextFindLeaderAndSubmit interpreter mockServer []
+    assertBlockNoBackoff dbSync 3
+  where
+    testLabel = "stakeAddressRollback"
+
 configNoPools :: IOManager -> [(Text, Text)] -> Assertion
 configNoPools =
     withFullConfig "config2" testLabel $ \_ _ dbSync -> do

cardano-db-sync/src/Cardano/DbSync/Cache.hs

@@ -216,9 +216,9 @@ rollbackStakeAddr ci mBlockNo nBlocks = do
         then liftIO $ atomically $ writeTVar (cStakeCreds ci) Map.empty
         else do
           initMp <- liftIO $ readTVarIO (cStakeCreds ci)
-          stakeAddrIds <- DB.queryStakeAddressIdsAfter blockNo
-          let stakeAddrIdsSet = Set.fromList stakeAddrIds
-          let !mp = Map.filter (`Set.member` stakeAddrIdsSet) initMp
+          stakeAddrIdsToDelete <- DB.queryStakeAddressIdsAfter blockNo
+          let stakeAddrIdsSetToDelete = Set.fromList stakeAddrIdsToDelete
+          let !mp = Map.filter (`Set.notMember` stakeAddrIdsSetToDelete) initMp
           liftIO $ atomically $ writeTVar (cStakeCreds ci) mp
 
 queryRewardAccountWithCache

cardano-db-sync/src/Cardano/DbSync/Rollback.hs

@@ -58,6 +58,7 @@ rollbackToPoint env point = do
         -- 'length xs' here gives an approximation of the blocks deleted. An approximation
         -- is good enough, since it is only used to decide on the best policy and is not
         -- important for correctness.
+        -- We need to first cleanup the cache and then delete the blocks from db.
         lift $ rollbackCache cache mBlockNo (fromIntegral $ length xs)
         deleted <- lift $ DB.deleteCascadeAfter prevId
         liftIO . logInfo trce $