self-delegation fixed

Author: Satchitananda

app/upgrades/v7_10/upgrades.go

@@ -195,6 +195,76 @@ func moveDelegations(ctx sdk.Context, k stakingkeeper.Keeper, oldAddress sdk.Acc
 	}
 }
 
+func moveSelfDelegation(ctx sdk.Context, keepers  *keepers.AppKeepers, oldDelegatorAddress sdk.AccAddress, newDelegatorAddress sdk.AccAddress, validatorAddr sdk.ValAddress) error {
+    stakingKeeper := keepers.StakingKeeper
+	
+	// Get the delegation from the old validator
+    delegation, found := stakingKeeper.GetDelegation(ctx, oldDelegatorAddress, validatorAddr)
+    if !found {
+		log.Printf("self delegation not found: %s", oldDelegatorAddress)
+        return fmt.Errorf("self delegation not found")
+    }
+
+    // Remove delegation from the old validator
+    stakingKeeper.RemoveDelegation(ctx, delegation)
+
+	balance, err := getBalance(ctx, *keepers.StakingKeeper, keepers.AccountKeeper, keepers.BankKeeper, oldDelegatorAddress)
+	if err != nil {
+		log.Printf("Error when retrieving balance for address %s: %s",  oldDelegatorAddress, err)
+		return err
+	}
+
+	log.Printf("Sending coins from %v to %v (%v)", oldDelegatorAddress, newDelegatorAddress, balance)
+
+	err = sendCoins(ctx, keepers.BankKeeper, oldDelegatorAddress, newDelegatorAddress, balance)
+	if err != nil {
+		log.Printf("Error when sending coins for address %s: %s",  oldDelegatorAddress, err)
+		return err
+	}
+
+    // Assuming you've calculated or know the amount to redelegate
+    amount := delegation.Shares
+
+    // Create a new delegation to the new validator
+    newDelegation := stakingtypes.Delegation{
+        DelegatorAddress: newDelegatorAddress.String(),
+        ValidatorAddress: validatorAddr.String(),
+        Shares:           amount,
+    }
+	
+	err = stakingKeeper.Hooks().BeforeDelegationCreated(ctx, delegation.GetDelegatorAddr(), validatorAddr) 
+	if err != nil {
+		log.Printf("Error when running hook before adding delegation %v to %v", delegation.GetDelegatorAddr(), validatorAddr)
+		return err
+	}
+    // Save the new delegation
+    stakingKeeper.SetDelegation(ctx, newDelegation)
+
+    // Update the old validator's and new validator's tokens and delegator shares
+    validator, found := stakingKeeper.GetValidator(ctx, validatorAddr)
+    if !found {
+        return fmt.Errorf("old validator not found")
+    }
+
+
+    // Convert shares to tokens if necessary. This example assumes `amount` is already in tokens.
+    // You might need to adjust based on your actual data and the SDK's version.
+    // tokens := sdk.TokensFromConsensusPower(int64(amount.TruncateInt64()), sdk.DefaultPowerReduction)
+
+    // oldValidator.Tokens = oldValidator.Tokens.Sub(tokens)
+    // newValidator.Tokens = newValidator.Tokens.Add(tokens)
+
+    // Ensure to update the validators' power index if their tokens have changed
+    stakingKeeper.SetValidator(ctx, validator)
+    // stakingKeeper.SetValidator(ctx, newValidator)
+
+    // This operation should ideally be followed by updates to the pool's bonded tokens
+    // and triggering any necessary events or hooks for state consistency
+
+    return nil
+}
+
+
 func sendCoins(
 	ctx sdk.Context,
 	bankkeeper bankkeeper.Keeper,
@@ -242,7 +312,7 @@ func fixDefiantLabs(ctx sdk.Context, keepers *keepers.AppKeepers) (error) {
 		return err
 	}
 
-	DanVal, found := keepers.StakingKeeper.GetValidator(ctx, DefiantLabsValAddress)
+	DefiantLabsVal, found := keepers.StakingKeeper.GetValidator(ctx, DefiantLabsValAddress)
 	if !found {
 		log.Printf("Validator with %v has not been found", DefiantLabsValAddress)
 		return err
@@ -260,41 +330,47 @@ func fixDefiantLabs(ctx sdk.Context, keepers *keepers.AppKeepers) (error) {
 		return err
 	}
 
-	// Donating 10K loki to DefiantLab to automate his self-delegation process
-	
-	OdinMainnet3DonorAddr, err := sdk.AccAddressFromBech32(OdinMainnet3OldAccAddress)
+	// Moving DefiantLabs self-delegation
+	err = moveSelfDelegation(ctx, keepers, DefiantLabsOldAcc, DefiantLabsAcc,  DefiantLabsValAddress)
 	if err != nil {
-		log.Printf("account address is not valid bech32: %s: %s", OdinMainnet3OldAccAddress, err)
 		return err
 	}
 
-	log.Printf("Donating coins for self-delegation %v", DefiantLabsValAddress)
-	sendCoins(ctx, keepers.BankKeeper, OdinMainnet3DonorAddr, DefiantLabsAcc, sdk.NewCoins(sdk.NewCoin("loki", sdk.NewInt(10000))))
+	// Donating 10K loki to DefiantLab to automate his self-delegation process
 
-	keepers.DistrKeeper.SetWithdrawAddr(ctx, DefiantLabsAcc, DefiantLabsAcc)
+	// OdinMainnet3DonorAddr, err := sdk.AccAddressFromBech32(OdinMainnet3OldAccAddress)
+	// if err != nil {
+	// 	log.Printf("account address is not valid bech32: %s: %s", OdinMainnet3OldAccAddress, err)
+	// 	return err
+	// }
+
+	// log.Printf("Donating coins for self-delegation %v", DefiantLabsValAddress)
+	// sendCoins(ctx, keepers.BankKeeper, OdinMainnet3DonorAddr, DefiantLabsAcc, sdk.NewCoins(sdk.NewCoin("loki", sdk.NewInt(10000))))
 
-	// sending balances
-	ctx.Logger().Info(fmt.Sprintf("Sending tokens from %s to %s", DefiantLabOldAccAddress, DefiantLabAccAddress))
+	// keepers.DistrKeeper.SetWithdrawAddr(ctx, DefiantLabsAcc, DefiantLabsAcc)
+	
+	// // sending balances
+	// ctx.Logger().Info(fmt.Sprintf("Sending tokens from %s to %s", DefiantLabOldAccAddress, DefiantLabAccAddress))
 
-	balance, err := getBalance(ctx, *keepers.StakingKeeper, keepers.AccountKeeper, keepers.BankKeeper, DefiantLabsOldAcc)
-	if err != nil {
-		log.Printf("Error when retrieving balance for address %s: %s",  DefiantLabOldAccAddress, err)
-		return err
-	}
-	sendCoins(ctx, keepers.BankKeeper, DefiantLabsOldAcc, DefiantLabsAcc, balance)
+	// balance, err := getBalance(ctx, *keepers.StakingKeeper, keepers.AccountKeeper, keepers.BankKeeper, DefiantLabsOldAcc)
+	// if err != nil {
+	// 	log.Printf("Error when retrieving balance for address %s: %s",  DefiantLabOldAccAddress, err)
+	// 	return err
+	// }
+	// sendCoins(ctx, keepers.BankKeeper, DefiantLabsOldAcc, DefiantLabsAcc, balance)
 
 	// Moving delegations
-	moveDelegations(ctx, *keepers.StakingKeeper, DefiantLabsOldAcc, DanVal)
+	moveDelegations(ctx, *keepers.StakingKeeper, DefiantLabsOldAcc, DefiantLabsVal)
 
 	// Self delegating to new validator
-	selfDel := keepers.StakingKeeper.Delegation(ctx, DefiantLabsAcc, DefiantLabsValAddress)
-	if selfDel == nil {
-		err := SelfDelegate(ctx, *keepers.StakingKeeper, keepers.BankKeeper, DefiantLabsAcc, DanVal, sdk.NewCoin("loki", math.NewInt(1000)))
-		if err != nil {
-			log.Printf("Error when self delegating to %v", DefiantLabsValAddress)
-			return err
-		}
-	}
+	// selfDel := keepers.StakingKeeper.Delegation(ctx, DefiantLabsAcc, DefiantLabsValAddress)
+	// if selfDel == nil {
+	// 	err := SelfDelegate(ctx, *keepers.StakingKeeper, keepers.BankKeeper, DefiantLabsAcc, DefiantLabsVal, sdk.NewCoin("loki", math.NewInt(1000)))
+	// 	if err != nil {
+	// 		log.Printf("Error when self delegating to %v", DefiantLabsValAddress)
+	// 		return err
+	// 	}
+	// }
 	return nil
 }