remove rewards on ban

Hydra-Chain · Nov 21, 2024 · affac9d · affac9d
1 parent a29d829
commit affac9d
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 12 deletions.
diff --git a/contracts/HydraChain/modules/Inspector/IInspector.sol b/contracts/HydraChain/modules/Inspector/IInspector.sol
@@ -7,7 +7,7 @@ interface IInspector {
     error NoBanSubject();
     error NoInitiateBanSubject();
     error BanAlreadyInitiated();
-    error NoBanInititated();
+    error NoBanInitiated();
 
     /**
      * @notice Set the penalty amount for the banned validators

diff --git a/contracts/HydraChain/modules/Inspector/Inspector.sol b/contracts/HydraChain/modules/Inspector/Inspector.sol
@@ -64,7 +64,7 @@ abstract contract Inspector is IInspector, ValidatorManager {
      */
     function terminateBanProcedure() external {
         if (bansInitiated[msg.sender] == 0) {
-            revert NoBanInititated();
+            revert NoBanInitiated();
         }
 
         bansInitiated[msg.sender] = 0;

diff --git a/contracts/HydraStaking/HydraStaking.sol b/contracts/HydraStaking/HydraStaking.sol
@@ -189,6 +189,8 @@ contract HydraStaking is
         // but only the leftForStaker will be automatically requested,
         // so we have to set the unstake amount - leftForStaker as liquidity debt that must be paid as well
         liquidityDebts[staker] += (unstakeAmount - leftForStaker).toInt256Safe();
+        // the generated rewards for the staker must be taken (if is active position, rewards will be already taken)
+        stakingRewards[staker].taken = stakingRewards[staker].total;
     }
 
     /**

diff --git a/contracts/HydraStaking/modules/VestedStaking/VestedStaking.sol b/contracts/HydraStaking/modules/VestedStaking/VestedStaking.sol
@@ -143,7 +143,6 @@ abstract contract VestedStaking is IVestedStaking, Staking, Vesting {
 
             if (stakeLeft == 0) {
                 // if position is closed when active, we delete all the vesting data
-                // that way allowing the user to open new position for the same staker with the same vesting manager
                 delete vestedStakingPositions[account];
             }
 

diff --git a/docs/HydraChain/HydraChain.md b/docs/HydraChain/HydraChain.md
@@ -1553,10 +1553,10 @@ error MustBeWhitelisted()
 
 
 
-### NoBanInititated
+### NoBanInitiated
 
 ```solidity
-error NoBanInititated()
+error NoBanInitiated()
 ```
 
 

diff --git a/docs/HydraChain/IHydraChain.md b/docs/HydraChain/IHydraChain.md
@@ -685,10 +685,10 @@ error MaxValidatorsReached()
 
 
 
-### NoBanInititated
+### NoBanInitiated
 
 ```solidity
-error NoBanInititated()
+error NoBanInitiated()
 ```
 
 

diff --git a/docs/HydraChain/modules/Inspector/IInspector.md b/docs/HydraChain/modules/Inspector/IInspector.md
@@ -196,10 +196,10 @@ error BanAlreadyInitiated()
 
 
 
-### NoBanInititated
+### NoBanInitiated
 
 ```solidity
-error NoBanInititated()
+error NoBanInitiated()
 ```
 
 

diff --git a/docs/HydraChain/modules/Inspector/Inspector.md b/docs/HydraChain/modules/Inspector/Inspector.md
@@ -1090,10 +1090,10 @@ error MustBeWhitelisted()
 
 
 
-### NoBanInititated
+### NoBanInitiated
 
 ```solidity
-error NoBanInititated()
+error NoBanInitiated()
 ```
 
 

diff --git a/test/HydraChain/Inspector.test.ts b/test/HydraChain/Inspector.test.ts
@@ -205,13 +205,21 @@ export function RunInspectorTests(): void {
       const unstakePenalty = await calculatePenaltyByWeeks(VESTING_DURATION_WEEKS - 1, this.minStake);
       const stakedAmount = await hydraStaking.stakeOf(staker.address);
 
+      // check the staking rewards before the ban
+      const rewardsBefore = await hydraStaking.stakingRewards(staker.address);
+      expect(rewardsBefore.total).to.be.not.equal(rewardsBefore.taken);
+
       const stakedAmountAfterPenalty = stakedAmount.sub(unstakePenalty).sub(validatorBanPenalty);
       const banTx = await systemHydraChain.connect(this.signers.governance).banValidator(staker.address);
       const withdrawableAmount = await hydraStaking.leftToWithdrawPerStaker(staker.address);
 
       await expect(banTx, "ValidatorBanned").to.emit(systemHydraChain, "ValidatorBanned").withArgs(staker.address);
       expect(withdrawableAmount, "withdrawable").to.be.equal(stakedAmountAfterPenalty);
 
+      // the staker should not have claimable rewards after the ban
+      const rewards = await hydraStaking.stakingRewards(staker.address);
+      expect(rewards.total).to.be.equal(rewards.taken);
+
       const liquidTokensThatMustBeCollected = (await hydraStaking.liquidityDebts(staker.address)).add(
         withdrawableAmount
       );
@@ -245,7 +253,7 @@ export function RunInspectorTests(): void {
 
       await expect(hydraChain.connect(validatorToBan).terminateBanProcedure()).to.be.revertedWithCustomError(
         hydraChain,
-        "NoBanInititated"
+        "NoBanInitiated"
       );
     });
 
@@ -276,12 +284,20 @@ export function RunInspectorTests(): void {
 
       await time.increase(BAN_THRESHOLD);
 
+      // check the staking rewards before the ban
+      const rewardsBefore = await hydraStaking.stakingRewards(inBanProcessValidator.address);
+      expect(rewardsBefore.total).to.be.not.equal(rewardsBefore.taken);
+
       const stakedAmount = await hydraStaking.stakeOf(inBanProcessValidator.address);
       const banTx = await hydraChain.banValidator(inBanProcessValidator.address);
       const reporterReward = await hydraChain.reporterReward();
       const validatorBanPenalty = await hydraChain.validatorPenalty();
       const withdrawableAmount = await hydraStaking.leftToWithdrawPerStaker(inBanProcessValidator.address);
 
+      // the staker should not have claimable rewards after the ban
+      const rewards = await hydraStaking.stakingRewards(inBanProcessValidator.address);
+      expect(rewards.total).to.be.equal(rewards.taken);
+
       expect(await hydraStaking.stakeOf(inBanProcessValidator.address), "stakedOf").to.be.eq(0);
       expect(withdrawableAmount, "withdrawableAmount").to.be.equal(
         stakedAmount.sub(reporterReward).sub(validatorBanPenalty)