Skip to content

Commit

Permalink
Merge pull request #18 from realiotech/eduardo/staking-bug-fix
Browse files Browse the repository at this point in the history 
Bug: Delegation/Redelegation/Unbond
  • Loading branch information
@jiujiteiro
jiujiteiro authored Feb 8, 2023
2 parents 5f179fb + 29c2c78 commit 58546a8
Show file tree
Hide file tree
Showing 2 changed files with 194 additions and 4 deletions.
30 changes: 26 additions & 4 deletions x/staking/keeper/msg_server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ func (k msgServer) Delegate(goCtx context.Context, msg *types.MsgDelegate) (*typ
)
}

if msg.Amount.Denom != validator.BondDenom {
return nil, sdkerrors.Wrapf(
sdkerrors.ErrInvalidRequest, "validator does not support delegation with coin: got %s", msg.Amount.Denom,
)
}

// NOTE: source funds are always unbonded
newShares, err := k.Keeper.Delegate(ctx, delegatorAddress, msg.Amount, types.Unbonded, validator, true)
if err != nil {
Expand Down Expand Up @@ -271,6 +277,10 @@ func (k msgServer) BeginRedelegate(goCtx context.Context, msg *types.MsgBeginRed
if err != nil {
return nil, err
}
valDstAddr, err := sdk.ValAddressFromBech32(msg.ValidatorDstAddress)
if err != nil {
return nil, err
}
delegatorAddress, err := sdk.AccAddressFromBech32(msg.DelegatorAddress)
if err != nil {
return nil, err
Expand All @@ -288,9 +298,16 @@ func (k msgServer) BeginRedelegate(goCtx context.Context, msg *types.MsgBeginRed
)
}

valDstAddr, err := sdk.ValAddressFromBech32(msg.ValidatorDstAddress)
if err != nil {
return nil, err
// lookup dst val here to validate token early
validatorDst, found := k.GetValidator(ctx, valDstAddr)
if !found {
return nil, types.ErrNoValidatorFound
}

if msg.Amount.Denom != validatorDst.BondDenom {
return nil, sdkerrors.Wrapf(
sdkerrors.ErrInvalidRequest, "validator does not support redelegation with coin: got %s", msg.Amount.Denom,
)
}

completionTime, err := k.BeginRedelegation(
Expand Down Expand Up @@ -350,7 +367,12 @@ func (k msgServer) Undelegate(goCtx context.Context, msg *types.MsgUndelegate) (
return nil, err
}

if supported := k.IsBondDenomSupported(ctx, msg.Amount.Denom); !supported {
validator, found := k.GetValidator(ctx, addr)
if !found {
return nil, types.ErrNoValidatorFound
}

if msg.Amount.Denom != validator.BondDenom {
return nil, sdkerrors.Wrapf(
sdkerrors.ErrInvalidRequest, "invalid coin denomination: got %s", msg.Amount.Denom,
)
Expand Down
168 changes: 168 additions & 0 deletions x/staking/keeper/msg_server_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package keeper_test

import (
"github.com/cosmos/cosmos-sdk/x/staking/teststaking"
"testing"
"time"

Expand All @@ -14,6 +15,173 @@ import (
"github.com/cosmos/cosmos-sdk/x/staking/types"
)

func TestDelegate(t *testing.T) {
// setup the app
app := simapp.Setup(t, false)
ctx := app.BaseApp.NewContext(false, tmproto.Header{})
msgServer := keeper.NewMsgServerImpl(app.StakingKeeper)
bondDenom := app.StakingKeeper.BondDenom(ctx)

// get pool for checks later
bondedPool := app.StakingKeeper.GetBondedPool(ctx)
moduleBalance := app.BankKeeper.GetBalance(ctx, bondedPool.GetAddress(), app.StakingKeeper.BondDenom(ctx))

// accounts
delAddrs := simapp.AddTestAddrsIncremental(app, ctx, 2, sdk.NewInt(10000))
validators := app.StakingKeeper.GetValidators(ctx, 10)
require.Equal(t, len(validators), 1)


testCases := []struct {
Name string
ExceptErr bool
req types.MsgDelegate
}{
{
Name: "invalid coin",
ExceptErr: true,
req: types.MsgDelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorAddress: validators[0].OperatorAddress,
Amount: sdk.NewCoin("foo_coin", sdk.NewInt(4)),
},
},
{
Name: "validator not exists",
ExceptErr: true,
req: types.MsgDelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorAddress: sdk.ValAddress(sdk.AccAddress("asdsad")).String(),
Amount: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(4)),
},
},
{
Name: "invalid delegator address",
ExceptErr: true,
req: types.MsgDelegate{
DelegatorAddress: "invalid_delegator_addrtess",
ValidatorAddress: validators[0].OperatorAddress,
Amount: sdk.NewCoin("foo_coin", sdk.NewInt(4)),

},
},

{
Name: "success",
ExceptErr: false,
req: types.MsgDelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorAddress: validators[0].OperatorAddress,
Amount:sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(5)),
},
},
}

for _, testCase := range testCases {
t.Run(testCase.Name, func(t *testing.T) {
_, err := msgServer.Delegate(ctx, &testCase.req)
if testCase.ExceptErr {
require.Error(t, err)
} else {
require.NoError(t, err)
balanceForBondedPool := app.BankKeeper.GetBalance(ctx, sdk.AccAddress(bondedPool.GetAddress()), bondDenom)
require.Equal(t, balanceForBondedPool, moduleBalance.Add(testCase.req.Amount))
}
})
}
}

func TestRedelegate(t *testing.T) {
// setup the app
app := simapp.Setup(t, false)
ctx := app.BaseApp.NewContext(false, tmproto.Header{})
msgServer := keeper.NewMsgServerImpl(app.StakingKeeper)

startTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 30)
startCoins := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, startTokens))

// add bonded tokens to pool for delegations
notBondedPool := app.StakingKeeper.GetNotBondedPool(ctx)
require.NoError(t, testutil.FundModuleAccount(app.BankKeeper, ctx, notBondedPool.GetName(), startCoins))
app.AccountKeeper.SetModuleAccount(ctx, notBondedPool)

// accounts
delAddrs := simapp.AddTestAddrsIncremental(app, ctx, 2, sdk.NewInt(10000))
addrVals := simapp.ConvertAddrsToValAddrs(delAddrs)
validators := app.StakingKeeper.GetValidators(ctx, 10)
require.Equal(t, len(validators), 1)

//bring in new validator for redelegation
// create a validator with a self-delegation
validator := teststaking.NewValidator(t, addrVals[1], PKs[0])
valTokens := app.StakingKeeper.TokensFromConsensusPower(ctx, 10)
validator, issuedShares := validator.AddTokensFromDel(valTokens)
require.Equal(t, valTokens, issuedShares.RoundInt())
validator = keeper.TestingUpdateValidator(app.StakingKeeper, ctx, validator, true)

validators = app.StakingKeeper.GetValidators(ctx, 10)
require.Equal(t, len(validators), 2)

// testing unhappy path here as the keeper tests has coverage on success
testCases := []struct {
Name string
ExceptErr bool
req types.MsgBeginRedelegate
}{
{
Name: "invalid coin",
ExceptErr: true,
req: types.MsgBeginRedelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorSrcAddress: validators[0].OperatorAddress,
ValidatorDstAddress: validators[1].OperatorAddress,
Amount: sdk.NewCoin("foo_coin", sdk.NewInt(4)),
},
},
{
Name: "invalid src validator addr",
ExceptErr: true,
req: types.MsgBeginRedelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorSrcAddress: sdk.ValAddress(sdk.AccAddress("asdsad")).String(),
ValidatorDstAddress: validators[1].OperatorAddress,
Amount: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(4)),
},
},
{
Name: "dst validator not exists",
ExceptErr: true,
req: types.MsgBeginRedelegate{
DelegatorAddress: delAddrs[0].String(),
ValidatorSrcAddress: validators[0].OperatorAddress,
ValidatorDstAddress: sdk.ValAddress(sdk.AccAddress("asdsad")).String(),
Amount: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(4)),
},
},
{
Name: "invalid delegator address",
ExceptErr: true,
req: types.MsgBeginRedelegate{
DelegatorAddress: "invalid_delegator_addrtess",
ValidatorSrcAddress: validators[0].OperatorAddress,
ValidatorDstAddress: validators[1].OperatorAddress,
Amount: sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(4)),
},
},
}

for _, testCase := range testCases {
t.Run(testCase.Name, func(t *testing.T) {
_, err := msgServer.BeginRedelegate(ctx, &testCase.req)
if testCase.ExceptErr {
require.Error(t, err)
} else {
require.NoError(t, err)
}
})
}
}

func TestCancelUnbondingDelegation(t *testing.T) {
// setup the app
app := simapp.Setup(t, false)
Expand Down

0 comments on commit 58546a8

Please sign in to comment.