wohooo

x/dualstaking/keeper/migrations.go

@@ -93,6 +93,7 @@ func (m Migrator) HandleProviderDelegators(ctx sdk.Context) error {
 	}
 
 	// give money back to delegators from the bonded pool
+	originalDelegations := []dualstakingtypes.Delegation{}
 	for _, ind := range delegationsInds {
 		// find the delegation and keep its original form
 		var d dualstakingtypes.Delegation
@@ -101,10 +102,15 @@ func (m Migrator) HandleProviderDelegators(ctx sdk.Context) error {
 			continue
 		}
 
-		if d.Delegator == d.Provider {
+		if d.Delegator == d.Provider || d.Provider == EMPTY_PROVIDER {
 			continue
 		}
 
+		providerAddr, err := sdk.AccAddressFromBech32(d.Provider)
+		if err != nil {
+			return err
+		}
+
 		originalAmount := d.Amount
 
 		// zero the delegation amount in the fixation store
@@ -126,6 +132,25 @@ func (m Migrator) HandleProviderDelegators(ctx sdk.Context) error {
 		if err != nil {
 			return err
 		}
+
+		entry, found, index := m.keeper.epochstorageKeeper.GetStakeEntryByAddressCurrent(ctx, d.ChainID, providerAddr)
+		if !found {
+			continue
+		}
+		entry.DelegateTotal = entry.DelegateTotal.Sub(originalAmount)
+		m.keeper.epochstorageKeeper.ModifyStakeEntryCurrent(ctx, d.ChainID, entry, index)
+
+		originalDelegations = append(originalDelegations, d)
+	}
+
+	// get highest staked validator and delegate to it
+	validatorsByPower := m.keeper.stakingKeeper.GetBondedValidatorsByPower(ctx)
+	highestVal := validatorsByPower[0]
+	for _, d := range originalDelegations {
+		err := m.keeper.DelegateFull(ctx, d.Delegator, highestVal.OperatorAddress, d.Provider, d.ChainID, d.Amount)
+		if err != nil {
+			return err
+		}
 	}
 
 	return nil
@@ -207,21 +232,25 @@ func (m Migrator) VerifyDelegationsBalance(ctx sdk.Context) error {
 
 // MigrateVersion1To2 implements store migration: Create a self delegation for all providers, Make providers-validators delegations balance
 func (m Migrator) MigrateVersion1To2(ctx sdk.Context) error {
-	err := m.ConvertProviderStakeToSelfDelegation(ctx)
+	// first balance all validators
+	err := m.HandleValidatorsDelegators(ctx)
 	if err != nil {
 		return err
 	}
 
-	err = m.HandleProviderDelegators(ctx)
+	// create providers self delegations
+	err = m.ConvertProviderStakeToSelfDelegation(ctx)
 	if err != nil {
 		return err
 	}
 
-	err = m.HandleValidatorsDelegators(ctx)
+	// convert the rest of the delegations
+	err = m.HandleProviderDelegators(ctx)
 	if err != nil {
 		return err
 	}
 
+	// verify the balance once again to make sure
 	err = m.VerifyDelegationsBalance(ctx)
 	if err != nil {
 		return err