LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge PR #4553: Fix undelegate losing tokens issue

Browse Source
This commit is contained in:
helldealer 2019-06-15 16:26:17 +08:00 committed by Alexander Bezobchuk
parent 1e9ca4a15b
commit 941effc14d
3 changed files with 37 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.pending/improvements/sdk/4553-undelegate-max-entries-check-first Normal file
View File

@ -0,0 +1 @@
#4553 undelegate max entries check first

8
x/staking/keeper/delegation.go
View File

@ -583,15 +583,15 @@ func (k Keeper) Undelegate(
ctx sdk.Context, delAddr sdk.AccAddress, valAddr sdk.ValAddress, sharesAmount sdk.Dec,
) (time.Time, sdk.Error) {
if k.HasMaxUnbondingDelegationEntries(ctx, delAddr, valAddr) {
return time.Time{}, types.ErrMaxUnbondingDelegationEntries(k.Codespace())
}
returnAmount, err := k.unbond(ctx, delAddr, valAddr, sharesAmount)
if err != nil {
return time.Time{}, err
}
if k.HasMaxUnbondingDelegationEntries(ctx, delAddr, valAddr) {
return time.Time{}, types.ErrMaxUnbondingDelegationEntries(k.Codespace())
}
completionTime := ctx.BlockHeader().Time.Add(k.UnbondingTime(ctx))
ubd := k.SetUnbondingDelegationEntry(ctx, delAddr, valAddr, ctx.BlockHeight(), completionTime, returnAmount)
k.InsertUBDQueue(ctx, ubd, completionTime)

33
x/staking/keeper/delegation_test.go
View File

@ -207,7 +207,7 @@ func TestUnbondDelegation(t *testing.T) {
}
func TestUnbondingDelegationsMaxEntries(t *testing.T) {
ctx, _, keeper := CreateTestInput(t, false, 1)
ctx, ak, keeper := CreateTestInput(t, false, 1)
pool := keeper.GetPool(ctx)
startTokens := sdk.TokensFromConsensusPower(10)
pool.NotBondedTokens = startTokens
@ -236,15 +236,46 @@ func TestUnbondingDelegationsMaxEntries(t *testing.T) {
require.NoError(t, err)
}
// delegator shares should be reduced by 7
delegator, _ := keeper.GetDelegation(ctx, addrDels[0], addrVals[0])
require.Equal(t, sdk.NewDec(9999993), delegator.GetShares())
acc := ak.GetAccount(ctx, addrDels[0])
require.Equal(t, int64(1000000), acc.GetCoins().AmountOf("stake").Int64())
// an additional unbond should fail due to max entries
_, err := keeper.Undelegate(ctx, addrDels[0], addrVals[0], sdk.NewDec(1))
require.Error(t, err)
// delegator shares should not reduced
delegator, _ = keeper.GetDelegation(ctx, addrDels[0], addrVals[0])
require.Equal(t, sdk.NewDec(9999993), delegator.GetShares())
// mature unbonding delegations
ctx = ctx.WithBlockTime(completionTime)
err = keeper.CompleteUnbonding(ctx, addrDels[0], addrVals[0])
require.NoError(t, err)
// delegator account balance should be increased by 7
acc = ak.GetAccount(ctx, addrDels[0])
require.Equal(t, int64(1000007), acc.GetCoins().AmountOf("stake").Int64())
completionTime, err = keeper.Undelegate(ctx, addrDels[0], addrVals[0], sdk.NewDec(3))
require.NoError(t, err)
// delegator shares should be reduced by 3
dele2, _ := keeper.GetDelegation(ctx, addrDels[0], addrVals[0])
require.Equal(t, sdk.NewDec(9999990), dele2.GetShares())
// mature unbonding delegations
ctx = ctx.WithBlockTime(completionTime)
err = keeper.CompleteUnbonding(ctx, addrDels[0], addrVals[0])
require.NoError(t, err)
// delegator account balance should be increased by 3
acc = ak.GetAccount(ctx, addrDels[0])
require.Equal(t, int64(1000010), acc.GetCoins().AmountOf("stake").Int64())
// unbonding should work again
_, err = keeper.Undelegate(ctx, addrDels[0], addrVals[0], sdk.NewDec(1))
require.NoError(t, err)