fix: delegations tracking on vesting accounts

Author: Yurist-85

app/app.go

@@ -174,6 +174,7 @@ import (
 	v177 "github.com/haqq-network/haqq/app/upgrades/v1.7.7"
 	v178 "github.com/haqq-network/haqq/app/upgrades/v1.7.8"
 	v180 "github.com/haqq-network/haqq/app/upgrades/v1.8.0"
+	v181 "github.com/haqq-network/haqq/app/upgrades/v1.8.1"
 
 	// NOTE: override ICS20 keeper to support IBC transfers of ERC20 tokens
 	"github.com/haqq-network/haqq/x/ibc/transfer"
@@ -1281,6 +1282,12 @@ func (app *Haqq) setupUpgradeHandlers(keys map[string]*storetypes.KVStoreKey) {
 		v180.CreateUpgradeHandler(app.mm, app.configurator, *app.EvmKeeper, app.BankKeeper, app.DaoKeeper, keys[ucdaotypes.StoreKey]),
 	)
 
+	// v1.8.1 Fix delegations tracking on Vesting accounts
+	app.UpgradeKeeper.SetUpgradeHandler(
+		v181.UpgradeName,
+		v181.CreateUpgradeHandler(app.mm, app.configurator, app.AccountKeeper, *app.StakingKeeper.Keeper),
+	)
+
 	// When a planned update height is reached, the old binary will panic
 	// writing on disk the height and name of the update that triggered it
 	// This will read that value, and execute the preparations for the upgrade.

app/upgrades/v1.8.1/constants.go

@@ -0,0 +1,6 @@
+package v181
+
+const (
+	// UpgradeName is the shared upgrade plan name for mainnet
+	UpgradeName = "v1.8.1"
+)

app/upgrades/v1.8.1/upgrades.go

@@ -0,0 +1,66 @@
+package v181
+
+import (
+	"fmt"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+	"github.com/cosmos/cosmos-sdk/x/auth/types"
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
+	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	vestingtypes "github.com/haqq-network/haqq/x/vesting/types"
+)
+
+// CreateUpgradeHandler creates an SDK upgrade handler for v1.8.1
+func CreateUpgradeHandler(
+	mm *module.Manager,
+	configurator module.Configurator,
+	ak authkeeper.AccountKeeper,
+	sk stakingkeeper.Keeper,
+) upgradetypes.UpgradeHandler {
+	return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+		logger := ctx.Logger().With("upgrade", UpgradeName)
+
+		logger.Info("migrate vesting accounts")
+		migrateVestingAccounts(ctx, ak, sk)
+
+		// Leave modules are as-is to avoid running InitGenesis.
+		logger.Debug("running module migrations ...")
+		return mm.RunMigrations(ctx, configurator, vm)
+	}
+}
+
+func migrateVestingAccounts(ctx sdk.Context, ak authkeeper.AccountKeeper, sk stakingkeeper.Keeper) {
+	logger := ctx.Logger().With("upgrade", UpgradeName)
+	bondDenom := sk.BondDenom(ctx)
+	var vaCount int64
+
+	ak.IterateAccounts(ctx, func(acc types.AccountI) bool {
+		va, ok := acc.(*vestingtypes.ClawbackVestingAccount)
+		if !ok {
+			return false
+		}
+
+		bondedAmt := sk.GetDelegatorBonded(ctx, va.GetAddress())
+		unbondingAmt := sk.GetDelegatorUnbonding(ctx, va.GetAddress())
+		delegatedAmt := bondedAmt.Add(unbondingAmt)
+		delegated := sdk.NewCoins(sdk.NewCoin(bondDenom, delegatedAmt))
+		zeroCoins := sdk.NewCoins()
+
+		logger.Info(fmt.Sprintf("update vesting account: %s", va.GetAddress()))
+		logger.Info(fmt.Sprintf(" - set DelegatedVesting: %s -> %s", va.DelegatedVesting.String(), zeroCoins.String()))
+		logger.Info(fmt.Sprintf(" - set DelegatedFree: %s -> %s", va.DelegatedFree.String(), delegated.String()))
+
+		va.DelegatedVesting = sdk.NewCoins()
+		va.DelegatedFree = delegated
+
+		logger.Info("---")
+		ak.SetAccount(ctx, va)
+		vaCount++
+		return false
+	})
+
+	logger.Info(fmt.Sprintf("Updated Clawback Vesting Accounts: %d", vaCount))
+}

x/vesting/keeper/msg_server.go

@@ -438,7 +438,6 @@ func (k Keeper) addGrant(
 	bondedAmt := k.stakingKeeper.GetDelegatorBonded(ctx, vestingAddr)
 	unbondingAmt := k.stakingKeeper.GetDelegatorUnbonding(ctx, vestingAddr)
 	delegatedAmt := bondedAmt.Add(unbondingAmt)
-	delegated := sdk.NewCoins(sdk.NewCoin(k.stakingKeeper.BondDenom(ctx), delegatedAmt))
 
 	// modify schedules for the new grant
 	accStartTime := va.GetStartTime()
@@ -459,10 +458,9 @@ func (k Keeper) addGrant(
 	va.VestingPeriods = newVestingPeriods
 	va.OriginalVesting = va.OriginalVesting.Add(grantCoins...)
 
-	// cap DV at the current unvested amount, DF rounds out to current delegated
-	unvested := va.GetVestingCoins(ctx.BlockTime())
-	va.DelegatedVesting = delegated.Min(unvested)
-	va.DelegatedFree = delegated.Sub(va.DelegatedVesting...)
+	// DF rounds out to current delegated
+	va.DelegatedVesting = sdk.NewCoins()
+	va.DelegatedFree = sdk.NewCoins(sdk.NewCoin(k.stakingKeeper.BondDenom(ctx), delegatedAmt))
 	return nil
 }
 

x/vesting/keeper/schedule.go

@@ -69,8 +69,11 @@ func (k Keeper) ApplyVestingSchedule(
 			vestingPeriods,
 			&codeHash,
 		)
-		acc := k.accountKeeper.NewAccount(ctx, vestingAcc)
-		k.accountKeeper.SetAccount(ctx, acc)
+		bondedAmt := k.stakingKeeper.GetDelegatorBonded(ctx, vestingAcc.GetAddress())
+		unbondingAmt := k.stakingKeeper.GetDelegatorUnbonding(ctx, vestingAcc.GetAddress())
+		delegatedAmt := bondedAmt.Add(unbondingAmt)
+		vestingAcc.DelegatedFree = sdk.NewCoins(sdk.NewCoin(k.stakingKeeper.BondDenom(ctx), delegatedAmt))
+		k.accountKeeper.SetAccount(ctx, vestingAcc)
 		return vestingAcc, false, false, nil
 	case isClawback && merge:
 		if funder.String() != vestingAcc.FunderAddress {