Skip to content

fix: check unbonding delegations in ExecuteAddValidator #126

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

Open
kpitapeersyst wants to merge 3 commits into
base: main
Choose a base branch
from
+25 −8
Open

fix: check unbonding delegations in ExecuteAddValidator #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
103c736
fix: check unbonding delegations from delegator perspective in Execut…
kpitapeersyst Apr 28, 2026
63ee5a0
Merge remote-tracking branch 'origin/main' into fix/poa-unbonding-del…
AdriaCarrera May 18, 2026
2c2b377
Merge branch 'main' into fix/poa-unbonding-delegation-check
kpitapeersyst May 21, 2026
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
3 changes: 2 additions & 1 deletion x/poa/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package keeper

import (
"fmt"
gomath "math"

"cosmossdk.io/math"

Expand Down Expand Up @@ -147,7 +148,7 @@ func (k Keeper) ExecuteAddValidator(ctx sdk.Context, msg *types.MsgAddValidator)
// Check if address has unbonding delegations with balance
// If so, return error since the account already has staking power
unbondingBalance := math.ZeroInt()
ubds, err := k.sk.GetUnbondingDelegationsFromValidator(ctx, valAddress)
ubds, err := k.sk.GetUnbondingDelegations(ctx, accAddress, gomath.MaxUint16)
if err != nil {
return err
}
Expand Down
14 changes: 7 additions & 7 deletions x/poa/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
},
},
{
name: "should fail - GetUnbondingDelegationsFromValidator returns error",
name: "should fail - GetUnbondingDelegations returns error",
validatorAddress: "ethm1a0pd5cyew47pvgf7rd7axxy3humv9ev0nnkprp",
expectedError: errors.New("staking unbonding delegations error"),
stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) {
Expand All @@ -224,7 +224,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil)
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil)
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, errors.New("staking unbonding delegations error"))
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, errors.New("staking unbonding delegations error"))
},
bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
bankKeeper.EXPECT().GetBalance(ctx, gomock.Any(), gomock.Any()).Return(sdk.Coin{
Expand All @@ -245,7 +245,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil)
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil)
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{
{
Entries: []stakingtypes.UnbondingDelegationEntry{
{
Expand Down Expand Up @@ -274,7 +274,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil)
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil)
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
},
bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
bankKeeper.EXPECT().GetBalance(ctx, gomock.Any(), gomock.Any()).Return(sdk.Coin{
Expand All @@ -296,7 +296,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil)
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil)
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
},
bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
bankKeeper.EXPECT().GetBalance(ctx, gomock.Any(), gomock.Any()).Return(sdk.Coin{
Expand All @@ -319,7 +319,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil)
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil)
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
},
bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
bankKeeper.EXPECT().GetBalance(ctx, gomock.Any(), gomock.Any()).Return(sdk.Coin{
Expand Down Expand Up @@ -349,7 +349,7 @@ func TestKeeper_ExecuteAddValidator(t *testing.T) {
Shares: sdk.DefaultPowerReduction.ToLegacyDec(),
},
}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
stakingKeeper.EXPECT().GetUnbondingDelegations(ctx, gomock.Any(), gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil)
},
bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
bankKeeper.EXPECT().GetBalance(ctx, gomock.Any(), gomock.Any()).Return(sdk.Coin{
Expand Down
15 changes: 15 additions & 0 deletions x/poa/testutil/expected_keepers_mock.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions x/poa/types/expected_keepers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ type StakingKeeper interface {
GetAllValidators(ctx context.Context) (validators []stakingtypes.Validator, err error)
GetAllDelegations(ctx context.Context) (delegations []stakingtypes.Delegation, err error)
GetAllDelegatorDelegations(ctx context.Context, delegator sdk.AccAddress) ([]stakingtypes.Delegation, error)
GetUnbondingDelegations(ctx context.Context, delegator sdk.AccAddress, maxRetrieve uint16) ([]stakingtypes.UnbondingDelegation, error)
GetUnbondingDelegationsFromValidator(ctx context.Context, validator sdk.ValAddress) ([]stakingtypes.UnbondingDelegation, error)
SlashUnbondingDelegation(ctx context.Context, ubd stakingtypes.UnbondingDelegation, infractionHeight int64, slashFactor math.LegacyDec) (totalSlashAmount math.Int, err error)
RemoveDelegation(ctx context.Context, delegation stakingtypes.Delegation) error
Expand Down
Loading