Skip to content

[IF-FINDING-003] Minimum and maximum validator number validation #62

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

Merged
AdriaCarrera merged 3 commits into from
Mar 18, 2025
Merged

[IF-FINDING-003] Minimum and maximum validator number validation #62

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
4bb7102
fix: IF-FINDING-003 Minimum and maximum validator number validation
AdriaCarrera Mar 18, 2025
e396f7b
fix: casting on len(validators)
AdriaCarrera Mar 18, 2025
c2aa50c
fix: lint
AdriaCarrera Mar 18, 2025
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
11 changes: 11 additions & 0 deletions x/poa/keeper/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,17 @@ func (k Keeper) ExecuteAddValidator(ctx sdk.Context, msg *types.MsgAddValidator)
if err != nil {
return err
}

// Check if the maximum number of validators has been reached
validators, err := k.sk.GetAllValidators(ctx)
if err != nil {
return err
}
//nolint:gosec
if uint32(len(validators)) >= params.MaxValidators {
return types.ErrMaxValidatorsReached
}

denom := params.BondDenom
balance := k.bk.GetBalance(ctx, accAddress, denom)
if !balance.IsZero() {
Expand Down
4 changes: 3 additions & 1 deletion x/poa/keeper/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ func poaKeeperTestSetup(t *testing.T) (*Keeper, sdk.Context) {
stakingHooks.EXPECT().BeforeValidatorSlashed(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil).AnyTimes()

stakingKeeper.EXPECT().GetParams(ctx).Return(stakingtypes.Params{
BondDenom: "XRP",
BondDenom: "XRP",
MaxValidators: 32,
}, nil).AnyTimes()
stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{Tokens: math.NewInt(0)}, nil).AnyTimes()
stakingKeeper.EXPECT().GetAllDelegatorDelegations(ctx, gomock.Any()).Return([]stakingtypes.Delegation{}, nil).AnyTimes()
Expand All @@ -32,6 +33,7 @@ func poaKeeperTestSetup(t *testing.T) (*Keeper, sdk.Context) {
stakingKeeper.EXPECT().BondDenom(ctx).Return("XRP", nil).AnyTimes()
stakingKeeper.EXPECT().Unbond(ctx, gomock.Any(), gomock.Any(), gomock.Any()).Return(math.ZeroInt(), nil).AnyTimes()
stakingKeeper.EXPECT().Hooks().Return(stakingHooks).AnyTimes()
stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{}, nil).AnyTimes()
}

bankExpectations := func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) {
Expand Down
1 change: 1 addition & 0 deletions x/poa/types/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ var (
ErrAddressHasUnbondedTokens = sdkerrors.Register(ModuleName, 6, "address already has unbonded tokens")
ErrAddressHasDelegatedTokens = sdkerrors.Register(ModuleName, 7, "address already has delegated tokens")
ErrInvalidValidatorStatus = sdkerrors.Register(ModuleName, 8, "invalid validator status")
ErrMaxValidatorsReached = sdkerrors.Register(ModuleName, 9, "maximum number of validators reached")
)