Increase and Decrease are only on active validators (#1422)

* Increase and Descrease are only on active validators

* Update builtin/staker/staker.go

Co-authored-by: Paolo Galli <paolo.galli@vechain.org>

---------

Co-authored-by: Paolo Galli <paolo.galli@vechain.org>
Co-authored-by: vanja-vechain <122791588+vanja-vechain@users.noreply.github.com>

Author: 3 people

builtin/staker/staker.go

@@ -313,7 +313,10 @@ func (s *Staker) IncreaseStake(validator thor.Address, endorser thor.Address, am
 	if val.Status == validation.StatusExit {
 		return NewReverts("validator exited")
 	}
-	if val.Status == validation.StatusActive && val.ExitBlock != nil {
+	if val.Status != validation.StatusActive {
+		return NewReverts("can't increase stake while validator not active")
+	}
+	if val.ExitBlock != nil {
 		return NewReverts("validator has signaled exit, cannot increase stake")
 	}
 
@@ -327,10 +330,8 @@ func (s *Staker) IncreaseStake(validator thor.Address, endorser thor.Address, am
 		return err
 	}
 
-	if val.Status == validation.StatusActive {
-		if err = s.validationService.AddToRenewalList(validator); err != nil {
-			return err
-		}
+	if err = s.validationService.AddToRenewalList(validator); err != nil {
+		return err
 	}
 
 	// update global queued, use the initial multiplier
@@ -363,20 +364,14 @@ func (s *Staker) DecreaseStake(validator thor.Address, endorser thor.Address, am
 	if val.Status == validation.StatusExit {
 		return NewReverts("validator exited")
 	}
-	if val.Status == validation.StatusActive && val.ExitBlock != nil {
+	if val.Status != validation.StatusActive {
+		return NewReverts("can't decrease stake while validator not active")
+	}
+	if val.ExitBlock != nil {
 		return NewReverts("validator has signaled exit, cannot decrease stake")
 	}
 
-	var nextPeriodVET uint64
-	if val.Status == validation.StatusActive {
-		// We don't consider any increases, i.e., entry.QueuedVET. We only consider locked and current decreases.
-		// The reason is that validator can instantly withdraw QueuedVET at any time.
-		// We need to make sure the locked VET minus the sum of the current decreases is still above the minimum stake.
-		nextPeriodVET = val.LockedVET - val.PendingUnlockVET
-	}
-	if val.Status == validation.StatusQueued {
-		nextPeriodVET = val.QueuedVET
-	}
+	nextPeriodVET := val.LockedVET - val.PendingUnlockVET
 	if amount > nextPeriodVET {
 		return NewReverts("not enough locked stake")
 	}
@@ -389,22 +384,8 @@ func (s *Staker) DecreaseStake(validator thor.Address, endorser thor.Address, am
 		return err
 	}
 
-	if val.Status == validation.StatusActive {
-		if err = s.validationService.AddToRenewalList(validator); err != nil {
-			return err
-		}
-	}
-
-	if val.Status == validation.StatusQueued {
-		// update global queued
-		if err = s.globalStatsService.RemoveQueued(amount); err != nil {
-			return err
-		}
-
-		// update global withdrawable
-		if err = s.globalStatsService.AddWithdrawable(amount); err != nil {
-			return err
-		}
+	if err = s.validationService.AddToRenewalList(validator); err != nil {
+		return err
 	}
 
 	if err = s.ContractBalanceCheck(0); err != nil {

builtin/staker/staker_test.go

@@ -677,8 +677,10 @@ func TestValidation_DecreaseStake_ActiveTooLowNextPeriod(t *testing.T) {
 	end := id
 
 	assert.NoError(t, staker.AddValidation(id, end, thor.MediumStakingPeriod(), MinStakeVET))
+	_, err := staker.Housekeep(thor.MediumStakingPeriod())
+	assert.NoError(t, err)
 
-	err := staker.DecreaseStake(id, end, 100)
+	err = staker.DecreaseStake(id, end, 100)
 	assert.ErrorContains(t, err, "next period stake is lower than minimum stake")
 }
 
@@ -721,7 +723,10 @@ func TestValidation_DecreaseStake_QueuedTooLowNextPeriod(t *testing.T) {
 
 	assert.NoError(t, staker.AddValidation(id, end, thor.MediumStakingPeriod(), MinStakeVET))
 
-	err := staker.DecreaseStake(id, end, 100)
+	_, err := staker.Housekeep(thor.MediumStakingPeriod())
+	assert.NoError(t, err)
+
+	err = staker.DecreaseStake(id, end, 100)
 	assert.ErrorContains(t, err, "next period stake is lower than minimum stake")
 }
 
@@ -733,15 +738,19 @@ func TestValidation_DecreaseStake_QueuedSuccess(t *testing.T) {
 
 	assert.NoError(t, staker.AddValidation(id, end, thor.MediumStakingPeriod(), MinStakeVET+100))
 
+	_, err := staker.Housekeep(thor.MediumStakingPeriod())
+	assert.NoError(t, err)
+
 	assert.NoError(t, staker.DecreaseStake(id, end, 100))
 	withdrawable, err := staker.globalStatsService.GetWithdrawableStake()
 	assert.NoError(t, err)
-	assert.Equal(t, uint64(100), withdrawable)
+	assert.Equal(t, uint64(0), withdrawable)
 
 	v, err := staker.GetValidation(id)
 	assert.NoError(t, err)
-	assert.Equal(t, MinStakeVET, v.QueuedVET)
-	assert.Equal(t, uint64(100), v.WithdrawableVET)
+	assert.Equal(t, uint64(0), v.QueuedVET)
+	assert.Equal(t, MinStakeVET+100, v.LockedVET)
+	assert.Equal(t, uint64(0), v.WithdrawableVET)
 }
 
 func TestValidation_WithdrawStake_InvalidEndorser(t *testing.T) {