fixed staking reward removal at last exit

bze-alphateam · Mar 26, 2024 · 7416b2d · 7416b2d
1 parent 5366796
commit 7416b2d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/x/rewards/keeper/msg_server_exit_staking.go b/x/rewards/keeper/msg_server_exit_staking.go
@@ -46,7 +46,10 @@ func (k msgServer) ExitStaking(goCtx context.Context, msg *types.MsgExitStaking)
 		stakingReward.StakedAmount = remainingStakedAmount.String()
 		k.SetStakingReward(ctx, stakingReward)
 	} else {
-		k.RemoveStakingReward(ctx, stakingReward.RewardId)
+		//if this staking reward is finished (all funds were distributed and payouts executed) we should remove it
+		if stakingReward.Payouts >= stakingReward.Duration {
+			k.RemoveStakingReward(ctx, stakingReward.RewardId)
+		}
 	}
 
 	return &types.MsgExitStakingResponse{}, nil

diff --git a/x/rewards/keeper/staking_reward_distribution.go b/x/rewards/keeper/staking_reward_distribution.go
@@ -25,7 +25,7 @@ func (k Keeper) getDistributeRewardHandler() func(ctx sdk.Context, reward types.
 		err := k.distributeStakingRewards(&sr, sr.PrizeAmount)
 		if err != nil {
 			logger.Error(err.Error())
-			stop = true
+			stop = false
 			return
 		}