Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix undelegate losing tokens issue #4553

Merged
merged 2 commits into from
Jun 15, 2019
Merged

fix undelegate losing tokens issue #4553

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d44a319
fix undelegate lose tokens issue
helldealer Jun 14, 2019
41a7308
pending log
helldealer Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions x/staking/keeper/delegation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
33 changes: 32 additions & 1 deletion x/staking/keeper/delegation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down