Vanja/feat/783 multiplier from 1 to 2 only for locked vet (#1286)

* Refactor weights, only apply multiplier on locked

* Add debug logs

* Add debug logs

* Add debug logs

* Add debug logs

* Bug fix

* Clean up

* Add comments

* PR comment fix

* Handle exit

Author: vanja-vechain

builtin/staker/delegations_test.go

@@ -654,4 +654,23 @@ func TestStaker_DelegationExitingVET(t *testing.T) {
 
 	_, err = staker.Housekeep(thor.MediumStakingPeriod() * 2)
 	assert.NoError(t, err)
+
+	lVet, lWeight, err := staker.LockedVET()
+	assert.NoError(t, err)
+	assert.Equal(t, big.NewInt(0).String(), lVet.String())
+	assert.Equal(t, big.NewInt(0).String(), lWeight.String())
+
+	qVet, qWeight, err := staker.QueuedStake()
+	assert.NoError(t, err)
+	assert.Equal(t, big.NewInt(0).String(), qVet.String())
+	assert.Equal(t, big.NewInt(0).String(), qWeight.String())
+
+	total, err := staker.GetValidationTotals(*firstActive)
+	assert.NoError(t, err)
+	assert.Equal(t, big.NewInt(0), total.TotalLockedStake)
+	assert.Equal(t, big.NewInt(0), total.TotalLockedWeight)
+	assert.Equal(t, big.NewInt(0), total.TotalQueuedStake)
+	assert.Equal(t, big.NewInt(0), total.TotalQueuedWeight)
+	assert.Equal(t, big.NewInt(0), total.TotalExitingStake)
+	assert.Equal(t, big.NewInt(0), total.TotalExitingWeight)
 }

builtin/staker/housekeep.go

@@ -211,7 +211,11 @@ func (s *Staker) applyEpochTransition(transition *EpochTransition) error {
 		logger.Info("exiting validator", "validator", transition.ExitValidator)
 
 		// Now call ExitValidator to get the actual exit details and perform the exit
-		exit, err := s.validationService.ExitValidator(*transition.ExitValidator)
+		agg, err := s.aggregationService.GetAggregation(*transition.ExitValidator)
+		if err != nil {
+			return err
+		}
+		exit, err := s.validationService.ExitValidator(*transition.ExitValidator, agg.LockedWeight)
 		if err != nil {
 			return err
 		}

builtin/staker/validation/service.go

@@ -387,15 +387,15 @@ func (s *Service) NextToActivate(maxLeaderGroupSize *big.Int) (*thor.Address, er
 }
 
 // ExitValidator removes the validator from the active list and puts it in cooldown.
-func (s *Service) ExitValidator(validator thor.Address) (*delta.Exit, error) {
+func (s *Service) ExitValidator(validator thor.Address, aggWeight *big.Int) (*delta.Exit, error) {
 	entry, err := s.GetValidation(validator)
 	if err != nil {
 		return nil, err
 	}
 	if entry.IsEmpty() {
 		return nil, nil
 	}
-	exit := entry.exit()
+	exit := entry.exit(aggWeight)
 	if err = s.leaderGroup.Remove(validator); err != nil {
 		return nil, err
 	}

builtin/staker/validation/service_test.go

@@ -117,7 +117,7 @@ func TestService_ActivateAndExit_Flow(t *testing.T) {
 	assert.Equal(t, big.NewInt(100), after.LockedVET)
 	assert.Equal(t, big.NewInt(0), after.QueuedVET)
 
-	exit, err := svc.ExitValidator(id)
+	exit, err := svc.ExitValidator(id, nil)
 	assert.NoError(t, err)
 	assert.True(t, exit.ExitedTVL.Sign() >= 0)
 

builtin/staker/validation/validation.go

@@ -170,8 +170,12 @@ func (v *Validation) renew(aggregations *delta.Renewal, delegationWeight *big.In
 	}
 }
 
-func (v *Validation) exit() *delta.Exit {
+func (v *Validation) exit(aggWeight *big.Int) *delta.Exit {
+	if aggWeight == nil {
+		aggWeight = big.NewInt(0)
+	}
 	releaseLockedTVL := big.NewInt(0).Set(v.LockedVET)
+	releaseLockedWeight := big.NewInt(0).Sub(v.Weight, aggWeight)
 	releaseQueuedTVL := big.NewInt(0).Set(v.QueuedVET)
 
 	// move locked to cooldown
@@ -193,7 +197,7 @@ func (v *Validation) exit() *delta.Exit {
 	// We only return the change in the validation's TVL and weight
 	return &delta.Exit{
 		ExitedTVL:            releaseLockedTVL,
-		ExitedTVLWeight:      stakes.NewWeightedStake(releaseLockedTVL, Multiplier).Weight(),
+		ExitedTVLWeight:      releaseLockedWeight,
 		QueuedDecrease:       releaseQueuedTVL,
 		QueuedDecreaseWeight: stakes.NewWeightedStake(releaseQueuedTVL, Multiplier).Weight(),
 	}

builtin/staker/validation/validation_test.go

@@ -71,7 +71,7 @@ func TestValidation_NextPeriodTVL(t *testing.T) {
 
 func TestValidation_Exit(t *testing.T) {
 	val := baseVal
-	delta := val.exit()
+	delta := val.exit(nil)
 	assert.Equal(t, StatusExit, val.Status)
 	assert.Equal(t, big.NewInt(1000), val.CooldownVET)
 	assert.Equal(t, big.NewInt(0), val.LockedVET)

builtin/staker/validations_test.go

@@ -146,7 +146,7 @@ func TestStaker_TotalStake(t *testing.T) {
 	}
 
 	for id, stake := range stakes {
-		exit, err := staker.validationService.ExitValidator(id)
+		exit, err := staker.validationService.ExitValidator(id, nil)
 		require.NoError(t, err)
 
 		// exit the aggregation too
@@ -196,7 +196,7 @@ func TestStaker_TotalStake_Withdrawal(t *testing.T) {
 	assert.Equal(t, 0, queuedStake.Sign())
 	assert.Equal(t, 0, queuedWeight.Sign())
 
-	exit, err := staker.validationService.ExitValidator(addr)
+	exit, err := staker.validationService.ExitValidator(addr, nil)
 	require.NoError(t, err)
 
 	// exit the aggregation too
@@ -1243,7 +1243,7 @@ func TestStaker_RemoveValidator_NonExistent(t *testing.T) {
 	staker, _ := newStaker(t, 101, 101, true)
 
 	addr := datagen.RandAddress()
-	_, err := staker.validationService.ExitValidator(addr)
+	_, err := staker.validationService.ExitValidator(addr, nil)
 	assert.NoError(t, err)
 }
 
@@ -1263,7 +1263,7 @@ func TestStaker_RemoveValidator(t *testing.T) {
 	err = staker.SignalExit(addr, addr)
 	assert.NoError(t, err)
 
-	exit, err := staker.validationService.ExitValidator(addr)
+	exit, err := staker.validationService.ExitValidator(addr, nil)
 	require.NoError(t, err)
 
 	// exit the aggregation too
@@ -2474,7 +2474,7 @@ func TestStaker_AddValidation_CannotAddValidationWithSameMasterAfterExit(t *test
 	err = staker.SignalExit(master, endorser)
 	assert.NoError(t, err)
 
-	_, err = staker.validationService.ExitValidator(master)
+	_, err = staker.validationService.ExitValidator(master, nil)
 	assert.NoError(t, err)
 
 	err = staker.AddValidation(master, datagen.RandAddress(), uint32(360)*24*15, MinStake)