From 417d91394249bc65f55d6d4af89a1cc8784f625f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Wed, 17 Jun 2026 09:35:12 +0200 Subject: [PATCH 1/6] feat(poa): add validator self-removal message --- proto/poa/tx.proto | 13 + x/poa/keeper/keeper.go | 51 +++ .../msg_server_remove_validator_self.go | 18 + .../msg_server_remove_validator_self_test.go | 98 +++++ .../msg_server_remove_validator_test.go | 2 +- x/poa/types/codec.go | 4 + x/poa/types/errors.go | 1 + x/poa/types/events.go | 13 +- x/poa/types/message_remove_validator_self.go | 13 + x/poa/types/tx.pb.go | 397 ++++++++++++++++-- 10 files changed, 571 insertions(+), 39 deletions(-) create mode 100644 x/poa/keeper/msg_server_remove_validator_self.go create mode 100644 x/poa/keeper/msg_server_remove_validator_self_test.go create mode 100644 x/poa/types/message_remove_validator_self.go diff --git a/proto/poa/tx.proto b/proto/poa/tx.proto index e48d6f08..6fe01a3b 100644 --- a/proto/poa/tx.proto +++ b/proto/poa/tx.proto @@ -18,6 +18,8 @@ service Msg { rpc AddValidator(MsgAddValidator) returns (MsgAddValidatorResponse); // Removes an existing validator from the authority rpc RemoveValidator(MsgRemoveValidator) returns (MsgRemoveValidatorResponse); + // Allows a validator to remove itself from the authority + rpc RemoveValidatorSelf(MsgRemoveValidatorSelf) returns (MsgRemoveValidatorSelfResponse); } // MsgAddValidator defines a message for adding a new validator @@ -46,3 +48,14 @@ message MsgRemoveValidator { // MsgRemoveValidatorResponse defines the response for removing an existing // validator message MsgRemoveValidatorResponse {} + +// MsgRemoveValidatorSelf defines a message for a validator to remove itself +message MsgRemoveValidatorSelf { + option (cosmos.msg.v1.signer) = "validator_address"; + + string validator_address = 1 + [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; +} +// MsgRemoveValidatorSelfResponse defines the response for a validator +// removing itself +message MsgRemoveValidatorSelfResponse {} diff --git a/x/poa/keeper/keeper.go b/x/poa/keeper/keeper.go index 5a6af7bd..8cdd29f3 100644 --- a/x/poa/keeper/keeper.go +++ b/x/poa/keeper/keeper.go @@ -288,3 +288,54 @@ func (k Keeper) ExecuteRemoveValidator(ctx sdk.Context, validatorAddress string) return nil } + +func (k Keeper) ExecuteRemoveValidatorSelf(ctx sdk.Context, validatorAddress string) error { + accAddress, err := sdk.AccAddressFromBech32(validatorAddress) + if err != nil { + return err + } + valAddress := sdk.ValAddress(accAddress) + + validator, err := k.sk.GetValidator(ctx, valAddress) + if err != nil { + return types.ErrAddressIsNotAValidator + } + + // Prevent the last bonded validator from removing itself. If it is not bonded, the + // set will not be left empty by its removal. + if validator.IsBonded() { + validators, err := k.sk.GetAllValidators(ctx) + if err != nil { + return err + } + + bondedValidators := 0 + for _, v := range validators { + if v.IsBonded() { + bondedValidators++ + } + if bondedValidators > 1 { + break + } + } + if bondedValidators <= 1 { + return types.ErrCannotRemoveLastValidator + } + } + + err = k.ExecuteRemoveValidator(ctx, valAddress.String()) + if err != nil { + return err + } + + ctx.EventManager().EmitEvent( + sdk.NewEvent( + types.EventTypeRemoveValidatorSelf, + sdk.NewAttribute(types.AttributeValidator, valAddress.String()), + sdk.NewAttribute(types.AttributeHeight, fmt.Sprintf("%d", ctx.BlockHeight())), + sdk.NewAttribute(types.AttributeStakingTokens, fmt.Sprintf("%d", validator.Tokens)), + ), + ) + + return nil +} diff --git a/x/poa/keeper/msg_server_remove_validator_self.go b/x/poa/keeper/msg_server_remove_validator_self.go new file mode 100644 index 00000000..b9597b56 --- /dev/null +++ b/x/poa/keeper/msg_server_remove_validator_self.go @@ -0,0 +1,18 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/xrplevm/node/v10/x/poa/types" +) + +func (k msgServer) RemoveValidatorSelf(goCtx context.Context, msg *types.MsgRemoveValidatorSelf) (*types.MsgRemoveValidatorSelfResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + err := k.ExecuteRemoveValidatorSelf(ctx, msg.ValidatorAddress) + if err != nil { + return nil, err + } + + return &types.MsgRemoveValidatorSelfResponse{}, nil +} diff --git a/x/poa/keeper/msg_server_remove_validator_self_test.go b/x/poa/keeper/msg_server_remove_validator_self_test.go new file mode 100644 index 00000000..228187ff --- /dev/null +++ b/x/poa/keeper/msg_server_remove_validator_self_test.go @@ -0,0 +1,98 @@ +package keeper + +import ( + "errors" + "testing" + + "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/stretchr/testify/require" + "github.com/xrplevm/node/v10/x/poa/testutil" + "github.com/xrplevm/node/v10/x/poa/types" + "go.uber.org/mock/gomock" +) + +func TestMsgServer_RemoveValidatorSelf(t *testing.T) { + ctrl := gomock.NewController(t) + + const validatorAddress = "ethm1wunfhl05vc8r8xxnnp8gt62wa54r6y52pg03zq" + bondedValidator := stakingtypes.Validator{Status: stakingtypes.Bonded, Tokens: math.NewInt(0)} + + tt := []struct { + name string + validatorAddress string + stakingMocks func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) + bankMocks func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) + expectedErr error + }{ + { + name: "should fail - invalid validator address", + validatorAddress: "invalidvalidatoraddress", + stakingMocks: func(_ sdk.Context, _ *testutil.MockStakingKeeper) {}, + bankMocks: func(_ sdk.Context, _ *testutil.MockBankKeeper) {}, + expectedErr: errors.New("decoding bech32 failed"), + }, + { + name: "should fail - address is not a validator", + validatorAddress: validatorAddress, + stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) { + stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(stakingtypes.Validator{}, errors.New("validator not found")) + }, + bankMocks: func(_ sdk.Context, _ *testutil.MockBankKeeper) {}, + expectedErr: types.ErrAddressIsNotAValidator, + }, + { + name: "should fail - last bonded validator cannot self-remove", + validatorAddress: validatorAddress, + stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) { + stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(bondedValidator, nil) + stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{bondedValidator}, nil) + }, + bankMocks: func(_ sdk.Context, _ *testutil.MockBankKeeper) {}, + expectedErr: types.ErrCannotRemoveLastValidator, + }, + { + name: "should pass - reuses the RemoveValidator logic", + validatorAddress: validatorAddress, + stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) { + stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(bondedValidator, nil).Times(2) + stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{bondedValidator, bondedValidator}, nil) + stakingKeeper.EXPECT().GetParams(ctx).Return(stakingtypes.Params{BondDenom: "BND"}, nil) + stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil) + + hooks := testutil.NewMockStakingHooks(ctrl) + hooks.EXPECT().BeforeValidatorModified(ctx, gomock.Any()).Return(nil) + stakingKeeper.EXPECT().Hooks().Return(hooks) + + stakingKeeper.EXPECT().RemoveValidatorTokens(ctx, gomock.Any(), gomock.Any()).Return( + stakingtypes.Validator{Status: stakingtypes.Bonded}, nil, + ) + stakingKeeper.EXPECT().Unbond(ctx, gomock.Any(), gomock.Any(), gomock.Any()).Return(math.ZeroInt(), nil) + }, + bankMocks: func(ctx sdk.Context, bankKeeper *testutil.MockBankKeeper) { + bankKeeper.EXPECT().BurnCoins(ctx, stakingtypes.BondedPoolName, gomock.Any()).Return(nil) + }, + }, + } + + for _, tc := range tt { + t.Run(tc.name, func(t *testing.T) { + poaKeeper, ctx := setupPoaKeeper(t, tc.stakingMocks, tc.bankMocks) + + msgServer := NewMsgServerImpl(*poaKeeper) + + msg := &types.MsgRemoveValidatorSelf{ + ValidatorAddress: tc.validatorAddress, + } + + _, err := msgServer.RemoveValidatorSelf(ctx, msg) + if tc.expectedErr != nil { + require.Error(t, err) + require.Contains(t, err.Error(), tc.expectedErr.Error()) + } else { + require.NoError(t, err) + } + }) + } +} diff --git a/x/poa/keeper/msg_server_remove_validator_test.go b/x/poa/keeper/msg_server_remove_validator_test.go index 83a1047c..7ed51051 100644 --- a/x/poa/keeper/msg_server_remove_validator_test.go +++ b/x/poa/keeper/msg_server_remove_validator_test.go @@ -10,10 +10,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" "github.com/xrplevm/node/v10/x/poa/testutil" "github.com/xrplevm/node/v10/x/poa/types" + "go.uber.org/mock/gomock" ) func TestMsgServer_RemoveValidator(t *testing.T) { diff --git a/x/poa/types/codec.go b/x/poa/types/codec.go index 77d089cc..53f8e439 100644 --- a/x/poa/types/codec.go +++ b/x/poa/types/codec.go @@ -11,6 +11,7 @@ import ( func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgAddValidator{}, "poa/AddValidator", nil) cdc.RegisterConcrete(&MsgRemoveValidator{}, "poa/RemoveValidator", nil) + cdc.RegisterConcrete(&MsgRemoveValidatorSelf{}, "poa/RemoveValidatorSelf", nil) // this line is used by starport scaffolding # 2 } @@ -21,6 +22,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations((*sdk.Msg)(nil), &MsgRemoveValidator{}, ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgRemoveValidatorSelf{}, + ) registry.RegisterImplementations( (*govtypes.Content)(nil), ) diff --git a/x/poa/types/errors.go b/x/poa/types/errors.go index af388423..7ec70aab 100644 --- a/x/poa/types/errors.go +++ b/x/poa/types/errors.go @@ -15,4 +15,5 @@ var ( ErrInvalidValidatorStatus = sdkerrors.Register(ModuleName, 5, "invalid validator status") ErrAddressIsNotAValidator = sdkerrors.Register(ModuleName, 6, "address is not a validator") ErrMaxValidatorsReached = sdkerrors.Register(ModuleName, 7, "maximum number of validators reached") + ErrCannotRemoveLastValidator = sdkerrors.Register(ModuleName, 8, "cannot remove the last bonded validator") ) diff --git a/x/poa/types/events.go b/x/poa/types/events.go index b81d174f..394c15df 100644 --- a/x/poa/types/events.go +++ b/x/poa/types/events.go @@ -1,10 +1,11 @@ package types const ( - EventTypeAddValidator = "add_validator" - EventTypeRemoveValidator = "remove_validator" - AttributeValidator = "address" - AttributeHeight = "height" - AttributeStakingTokens = "staking_tokens" - AttributeBankTokens = "bank_tokens" + EventTypeAddValidator = "add_validator" + EventTypeRemoveValidator = "remove_validator" + EventTypeRemoveValidatorSelf = "remove_validator_self" + AttributeValidator = "address" + AttributeHeight = "height" + AttributeStakingTokens = "staking_tokens" + AttributeBankTokens = "bank_tokens" ) diff --git a/x/poa/types/message_remove_validator_self.go b/x/poa/types/message_remove_validator_self.go new file mode 100644 index 00000000..ecdb6369 --- /dev/null +++ b/x/poa/types/message_remove_validator_self.go @@ -0,0 +1,13 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ sdk.Msg = &MsgRemoveValidatorSelf{} + +func NewMsgRemoveValidatorSelf(address string) *MsgRemoveValidatorSelf { + return &MsgRemoveValidatorSelf{ + ValidatorAddress: address, + } +} diff --git a/x/poa/types/tx.pb.go b/x/poa/types/tx.pb.go index de14e58d..8e96f75d 100644 --- a/x/poa/types/tx.pb.go +++ b/x/poa/types/tx.pb.go @@ -230,48 +230,136 @@ func (m *MsgRemoveValidatorResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveValidatorResponse proto.InternalMessageInfo +// MsgRemoveValidatorSelf defines a message for a validator to remove itself +type MsgRemoveValidatorSelf struct { + ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` +} + +func (m *MsgRemoveValidatorSelf) Reset() { *m = MsgRemoveValidatorSelf{} } +func (m *MsgRemoveValidatorSelf) String() string { return proto.CompactTextString(m) } +func (*MsgRemoveValidatorSelf) ProtoMessage() {} +func (*MsgRemoveValidatorSelf) Descriptor() ([]byte, []int) { + return fileDescriptor_8ac16a0aed23c2e2, []int{4} +} +func (m *MsgRemoveValidatorSelf) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRemoveValidatorSelf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRemoveValidatorSelf.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgRemoveValidatorSelf) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRemoveValidatorSelf.Merge(m, src) +} +func (m *MsgRemoveValidatorSelf) XXX_Size() int { + return m.Size() +} +func (m *MsgRemoveValidatorSelf) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRemoveValidatorSelf.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRemoveValidatorSelf proto.InternalMessageInfo + +func (m *MsgRemoveValidatorSelf) GetValidatorAddress() string { + if m != nil { + return m.ValidatorAddress + } + return "" +} + +// MsgRemoveValidatorSelfResponse defines the response for a validator +// self-removal +type MsgRemoveValidatorSelfResponse struct { +} + +func (m *MsgRemoveValidatorSelfResponse) Reset() { *m = MsgRemoveValidatorSelfResponse{} } +func (m *MsgRemoveValidatorSelfResponse) String() string { return proto.CompactTextString(m) } +func (*MsgRemoveValidatorSelfResponse) ProtoMessage() {} +func (*MsgRemoveValidatorSelfResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_8ac16a0aed23c2e2, []int{5} +} +func (m *MsgRemoveValidatorSelfResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgRemoveValidatorSelfResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgRemoveValidatorSelfResponse.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *MsgRemoveValidatorSelfResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgRemoveValidatorSelfResponse.Merge(m, src) +} +func (m *MsgRemoveValidatorSelfResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgRemoveValidatorSelfResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgRemoveValidatorSelfResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgRemoveValidatorSelfResponse proto.InternalMessageInfo + func init() { proto.RegisterType((*MsgAddValidator)(nil), "poa.MsgAddValidator") proto.RegisterType((*MsgAddValidatorResponse)(nil), "poa.MsgAddValidatorResponse") proto.RegisterType((*MsgRemoveValidator)(nil), "poa.MsgRemoveValidator") proto.RegisterType((*MsgRemoveValidatorResponse)(nil), "poa.MsgRemoveValidatorResponse") + proto.RegisterType((*MsgRemoveValidatorSelf)(nil), "poa.MsgRemoveValidatorSelf") + proto.RegisterType((*MsgRemoveValidatorSelfResponse)(nil), "poa.MsgRemoveValidatorSelfResponse") } func init() { proto.RegisterFile("poa/tx.proto", fileDescriptor_8ac16a0aed23c2e2) } var fileDescriptor_8ac16a0aed23c2e2 = []byte{ - // 492 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x3f, 0x6f, 0xd3, 0x40, - 0x18, 0xc6, 0xed, 0x06, 0x2a, 0xe5, 0x5a, 0x51, 0x6a, 0x45, 0x8a, 0x6b, 0x15, 0xb7, 0x0a, 0x48, - 0x54, 0x95, 0xb8, 0x23, 0x45, 0x62, 0x60, 0x8b, 0x05, 0x0c, 0x54, 0x91, 0x2a, 0x23, 0x31, 0xb0, - 0x54, 0xe7, 0xf8, 0xb8, 0x5a, 0x8d, 0xfd, 0x9e, 0x7c, 0x67, 0x2b, 0xde, 0x10, 0x9f, 0x80, 0x2f, - 0xc0, 0xc4, 0xc2, 0xd8, 0x81, 0x9d, 0xb5, 0x62, 0xaa, 0x98, 0x98, 0x10, 0x4a, 0x86, 0x7e, 0x0d, - 0xe4, 0x3f, 0x47, 0x20, 0x21, 0x13, 0x4b, 0xe2, 0xf7, 0x7e, 0xef, 0xf3, 0xe8, 0x7d, 0x1f, 0x9f, - 0xd1, 0xa6, 0x00, 0x4a, 0xd4, 0x04, 0x8b, 0x14, 0x14, 0x58, 0x2d, 0x01, 0xd4, 0xe9, 0x70, 0xe0, - 0x50, 0xd5, 0xa4, 0x7c, 0xaa, 0x91, 0xb3, 0x33, 0x02, 0x19, 0x83, 0x3c, 0xad, 0x41, 0x5d, 0x34, - 0xa8, 0x5b, 0x57, 0x24, 0x96, 0x9c, 0xe4, 0xfd, 0xf2, 0xaf, 0x01, 0xf7, 0x1a, 0x20, 0x15, 0x3d, - 0x8f, 0x92, 0x12, 0x06, 0x4c, 0xd1, 0xbe, 0xae, 0xb5, 0x33, 0x07, 0xe0, 0x63, 0x46, 0xaa, 0x2a, - 0xc8, 0xde, 0x10, 0x9a, 0x14, 0x0d, 0xda, 0xa6, 0x71, 0x94, 0x00, 0xa9, 0x7e, 0xeb, 0xa3, 0xde, - 0x97, 0x35, 0xb4, 0x35, 0x94, 0x7c, 0x10, 0x86, 0xaf, 0xe8, 0x38, 0x0a, 0xa9, 0x82, 0xd4, 0x7a, - 0x8c, 0xda, 0x34, 0x53, 0x67, 0x90, 0x46, 0xaa, 0xb0, 0xcd, 0x7d, 0xf3, 0xa0, 0xed, 0xd9, 0xdf, - 0x3e, 0x3f, 0xe8, 0x34, 0x53, 0x0e, 0xc2, 0x30, 0x65, 0x52, 0xbe, 0x54, 0x69, 0x94, 0x70, 0x7f, - 0xde, 0x6a, 0xbd, 0x40, 0xdb, 0xb9, 0x36, 0x39, 0xa5, 0x75, 0x97, 0xbd, 0x56, 0xe9, 0xef, 0xac, - 0xd2, 0x7f, 0xba, 0xbe, 0x38, 0x34, 0xfc, 0xdb, 0xbf, 0x75, 0x0d, 0xb4, 0x4e, 0xd0, 0x46, 0xc8, - 0xe4, 0x28, 0x8d, 0x84, 0x8a, 0x20, 0xb1, 0x5b, 0xfb, 0xe6, 0xc1, 0xc6, 0xd1, 0x5d, 0xdc, 0x58, - 0xe8, 0x8d, 0x9b, 0x04, 0xf0, 0xd3, 0x79, 0xab, 0xd7, 0xbe, 0xfc, 0xb1, 0x67, 0x94, 0xb6, 0xa6, - 0xff, 0xa7, 0x85, 0xf5, 0x1c, 0xad, 0x8b, 0x2c, 0x38, 0x67, 0x85, 0x7d, 0xa3, 0x32, 0xeb, 0xe0, - 0x3a, 0x28, 0xac, 0x83, 0xc2, 0x83, 0xa4, 0xf0, 0xec, 0xaf, 0xf3, 0x41, 0x47, 0x69, 0x21, 0x14, - 0xe0, 0x93, 0x2c, 0x38, 0x66, 0x85, 0xdf, 0xa8, 0x9f, 0xdc, 0x7a, 0x77, 0x7d, 0x71, 0x38, 0xdf, - 0xba, 0xb7, 0x83, 0xba, 0x0b, 0x01, 0xfa, 0x4c, 0x0a, 0x48, 0x24, 0xeb, 0x7d, 0x34, 0x91, 0x35, - 0x94, 0xdc, 0x67, 0x31, 0xe4, 0xec, 0xff, 0xf3, 0x7d, 0xb6, 0x3a, 0xdf, 0xd5, 0xfa, 0xa5, 0x68, - 0x97, 0x16, 0xd8, 0x45, 0xce, 0xf2, 0x90, 0x7a, 0x87, 0xa3, 0x0f, 0x26, 0x6a, 0x0d, 0x25, 0xb7, - 0x3c, 0xb4, 0xf9, 0xd7, 0x25, 0xe9, 0x60, 0x01, 0x14, 0x2f, 0x6c, 0xee, 0xec, 0xfe, 0xeb, 0x54, - 0x7b, 0x59, 0xc7, 0x68, 0x6b, 0x31, 0x8b, 0xae, 0x16, 0x2c, 0x00, 0x67, 0x6f, 0x05, 0xd0, 0x66, - 0xce, 0xcd, 0xb7, 0xe5, 0x3b, 0xf6, 0x06, 0x97, 0x53, 0xd7, 0xbc, 0x9a, 0xba, 0xe6, 0xcf, 0xa9, - 0x6b, 0xbe, 0x9f, 0xb9, 0xc6, 0xd5, 0xcc, 0x35, 0xbe, 0xcf, 0x5c, 0xe3, 0xf5, 0x7d, 0x1e, 0xa9, - 0xb3, 0x2c, 0xc0, 0x23, 0x88, 0xc9, 0x24, 0x15, 0x63, 0x96, 0xc7, 0x24, 0x81, 0x90, 0x91, 0xbc, - 0xff, 0x90, 0x4c, 0x48, 0xf5, 0xa5, 0x16, 0x82, 0xc9, 0x60, 0xbd, 0xba, 0x01, 0x8f, 0x7e, 0x05, - 0x00, 0x00, 0xff, 0xff, 0xee, 0x6e, 0xf7, 0x6c, 0xbd, 0x03, 0x00, 0x00, + // 538 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x4f, 0x6b, 0x13, 0x41, + 0x18, 0xc6, 0xb3, 0x8d, 0x16, 0x32, 0x2d, 0xd6, 0xae, 0xa1, 0xd9, 0xae, 0x75, 0x1b, 0x52, 0xc1, + 0x52, 0x70, 0xc6, 0x54, 0xf0, 0xe0, 0x2d, 0x41, 0x3d, 0x58, 0x02, 0x65, 0x0b, 0x0a, 0x5e, 0xca, + 0x6c, 0x76, 0x3a, 0x5d, 0x9a, 0xdd, 0x77, 0xd8, 0x99, 0xc4, 0xec, 0x4d, 0xfc, 0x04, 0x7e, 0x07, + 0x2f, 0x1e, 0x7b, 0xf0, 0xee, 0xb5, 0x78, 0x2a, 0x9e, 0x3c, 0x89, 0x24, 0x87, 0x7e, 0x03, 0xcf, + 0xb2, 0xff, 0x12, 0x4d, 0xb2, 0x82, 0xf4, 0x92, 0xec, 0x3b, 0xbf, 0x79, 0x9f, 0x7d, 0xde, 0x67, + 0x86, 0x45, 0xab, 0x02, 0x28, 0x51, 0x43, 0x2c, 0x42, 0x50, 0xa0, 0x97, 0x05, 0x50, 0xb3, 0xca, + 0x81, 0x43, 0x52, 0x93, 0xf8, 0x29, 0x45, 0xe6, 0x66, 0x17, 0xa4, 0x0f, 0xf2, 0x38, 0x05, 0x69, + 0x91, 0xa1, 0x5a, 0x5a, 0x11, 0x5f, 0x72, 0x32, 0x68, 0xc6, 0x7f, 0x19, 0xb8, 0x9f, 0x01, 0xa9, + 0xe8, 0x99, 0x17, 0xc4, 0xd0, 0x61, 0x8a, 0x36, 0xf3, 0x3a, 0x57, 0xe6, 0x00, 0xbc, 0xc7, 0x48, + 0x52, 0x39, 0xfd, 0x13, 0x42, 0x83, 0x28, 0x43, 0xeb, 0xd4, 0xf7, 0x02, 0x20, 0xc9, 0x6f, 0xba, + 0xd4, 0xf8, 0xb2, 0x84, 0xd6, 0x3a, 0x92, 0xb7, 0x5c, 0xf7, 0x15, 0xed, 0x79, 0x2e, 0x55, 0x10, + 0xea, 0x4f, 0x50, 0x85, 0xf6, 0xd5, 0x29, 0x84, 0x9e, 0x8a, 0x0c, 0xad, 0xae, 0xed, 0x56, 0xda, + 0xc6, 0xb7, 0xcf, 0x0f, 0xab, 0x99, 0xcb, 0x96, 0xeb, 0x86, 0x4c, 0xca, 0x23, 0x15, 0x7a, 0x01, + 0xb7, 0xa7, 0x5b, 0xf5, 0x97, 0x68, 0x7d, 0x90, 0x8b, 0x1c, 0xd3, 0x74, 0x97, 0xb1, 0x94, 0xf4, + 0xdf, 0x2b, 0xea, 0xff, 0x74, 0x75, 0xbe, 0x57, 0xb2, 0x6f, 0x4f, 0xfa, 0x32, 0xa8, 0x1f, 0xa2, + 0x15, 0x97, 0xc9, 0x6e, 0xe8, 0x09, 0xe5, 0x41, 0x60, 0x94, 0xeb, 0xda, 0xee, 0xca, 0xfe, 0x0e, + 0xce, 0x24, 0xf2, 0x89, 0xb3, 0x04, 0xf0, 0xb3, 0xe9, 0xd6, 0x76, 0xe5, 0xe2, 0xc7, 0x76, 0x29, + 0x96, 0xd5, 0xec, 0x3f, 0x25, 0xf4, 0x17, 0x68, 0x59, 0xf4, 0x9d, 0x33, 0x16, 0x19, 0x37, 0x12, + 0xb1, 0x2a, 0x4e, 0x83, 0xc2, 0x79, 0x50, 0xb8, 0x15, 0x44, 0x6d, 0xe3, 0xeb, 0xd4, 0x68, 0x37, + 0x8c, 0x84, 0x02, 0x7c, 0xd8, 0x77, 0x0e, 0x58, 0x64, 0x67, 0xdd, 0x4f, 0x6f, 0xbd, 0xbf, 0x3a, + 0xdf, 0x9b, 0x4e, 0xdd, 0xd8, 0x44, 0xb5, 0x99, 0x00, 0x6d, 0x26, 0x05, 0x04, 0x92, 0x35, 0x3e, + 0x6a, 0x48, 0xef, 0x48, 0x6e, 0x33, 0x1f, 0x06, 0xec, 0xfa, 0xf9, 0x3e, 0x2f, 0xce, 0xb7, 0xb8, + 0x7f, 0x2e, 0xda, 0xb9, 0x01, 0xb6, 0x90, 0x39, 0x6f, 0x72, 0x32, 0xc3, 0x5b, 0xb4, 0x31, 0x4f, + 0x8f, 0x58, 0xef, 0x64, 0xb1, 0x1d, 0xed, 0xbf, 0xed, 0x6c, 0xc4, 0x76, 0xe6, 0x95, 0x1a, 0x75, + 0x64, 0x2d, 0x7e, 0x71, 0x6e, 0x6d, 0xff, 0x97, 0x86, 0xca, 0x1d, 0xc9, 0xf5, 0x36, 0x5a, 0xfd, + 0xeb, 0xfe, 0x56, 0xb1, 0x00, 0x8a, 0x67, 0x0e, 0xc5, 0xdc, 0x5a, 0xb4, 0x9a, 0x6b, 0xe9, 0x07, + 0x68, 0x6d, 0xf6, 0x98, 0x6a, 0x79, 0xc3, 0x0c, 0x30, 0xb7, 0x0b, 0xc0, 0x44, 0xec, 0x35, 0xba, + 0xb3, 0x28, 0xb0, 0xbb, 0x05, 0x7d, 0x31, 0x34, 0x77, 0xfe, 0x01, 0x73, 0x61, 0xf3, 0xe6, 0xbb, + 0xf8, 0x5e, 0xb7, 0x5b, 0x17, 0x23, 0x4b, 0xbb, 0x1c, 0x59, 0xda, 0xcf, 0x91, 0xa5, 0x7d, 0x18, + 0x5b, 0xa5, 0xcb, 0xb1, 0x55, 0xfa, 0x3e, 0xb6, 0x4a, 0x6f, 0x1e, 0x70, 0x4f, 0x9d, 0xf6, 0x1d, + 0xdc, 0x05, 0x9f, 0x0c, 0x43, 0xd1, 0x63, 0x03, 0x9f, 0x04, 0xe0, 0x32, 0x32, 0x68, 0x3e, 0x22, + 0x43, 0x92, 0x7c, 0x9d, 0x22, 0xc1, 0xa4, 0xb3, 0x9c, 0xdc, 0xfa, 0xc7, 0xbf, 0x03, 0x00, 0x00, + 0xff, 0xff, 0xf5, 0x69, 0x13, 0xe3, 0xb1, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -290,6 +378,8 @@ type MsgClient interface { AddValidator(ctx context.Context, in *MsgAddValidator, opts ...grpc.CallOption) (*MsgAddValidatorResponse, error) // Removes an existing validator from the authority RemoveValidator(ctx context.Context, in *MsgRemoveValidator, opts ...grpc.CallOption) (*MsgRemoveValidatorResponse, error) + // Allows a validator to remove itself by unbonding its self-delegation + RemoveValidatorSelf(ctx context.Context, in *MsgRemoveValidatorSelf, opts ...grpc.CallOption) (*MsgRemoveValidatorSelfResponse, error) } type msgClient struct { @@ -318,12 +408,23 @@ func (c *msgClient) RemoveValidator(ctx context.Context, in *MsgRemoveValidator, return out, nil } +func (c *msgClient) RemoveValidatorSelf(ctx context.Context, in *MsgRemoveValidatorSelf, opts ...grpc.CallOption) (*MsgRemoveValidatorSelfResponse, error) { + out := new(MsgRemoveValidatorSelfResponse) + err := c.cc.Invoke(ctx, "/poa.Msg/RemoveValidatorSelf", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + // MsgServer is the server API for Msg service. type MsgServer interface { // Adds a new validator into the authority AddValidator(context.Context, *MsgAddValidator) (*MsgAddValidatorResponse, error) // Removes an existing validator from the authority RemoveValidator(context.Context, *MsgRemoveValidator) (*MsgRemoveValidatorResponse, error) + // Allows a validator to remove itself + RemoveValidatorSelf(context.Context, *MsgRemoveValidatorSelf) (*MsgRemoveValidatorSelfResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -336,6 +437,9 @@ func (*UnimplementedMsgServer) AddValidator(ctx context.Context, req *MsgAddVali func (*UnimplementedMsgServer) RemoveValidator(ctx context.Context, req *MsgRemoveValidator) (*MsgRemoveValidatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveValidator not implemented") } +func (*UnimplementedMsgServer) RemoveValidatorSelf(ctx context.Context, req *MsgRemoveValidatorSelf) (*MsgRemoveValidatorSelfResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method RemoveValidatorSelf not implemented") +} func RegisterMsgServer(s grpc1.Server, srv MsgServer) { s.RegisterService(&_Msg_serviceDesc, srv) @@ -377,6 +481,24 @@ func _Msg_RemoveValidator_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } +func _Msg_RemoveValidatorSelf_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgRemoveValidatorSelf) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).RemoveValidatorSelf(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/poa.Msg/RemoveValidatorSelf", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).RemoveValidatorSelf(ctx, req.(*MsgRemoveValidatorSelf)) + } + return interceptor(ctx, in, info, handler) +} + var _Msg_serviceDesc = grpc.ServiceDesc{ ServiceName: "poa.Msg", HandlerType: (*MsgServer)(nil), @@ -389,6 +511,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "RemoveValidator", Handler: _Msg_RemoveValidator_Handler, }, + { + MethodName: "RemoveValidatorSelf", + Handler: _Msg_RemoveValidatorSelf_Handler, + }, }, Streams: []grpc.StreamDesc{}, Metadata: "poa/tx.proto", @@ -536,6 +662,59 @@ func (m *MsgRemoveValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } +func (m *MsgRemoveValidatorSelf) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgRemoveValidatorSelf) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgRemoveValidatorSelf) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.ValidatorAddress) > 0 { + i -= len(m.ValidatorAddress) + copy(dAtA[i:], m.ValidatorAddress) + i = encodeVarintTx(dAtA, i, uint64(len(m.ValidatorAddress))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgRemoveValidatorSelfResponse) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *MsgRemoveValidatorSelfResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgRemoveValidatorSelfResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + func encodeVarintTx(dAtA []byte, offset int, v uint64) int { offset -= sovTx(v) base := offset @@ -605,6 +784,28 @@ func (m *MsgRemoveValidatorResponse) Size() (n int) { return n } +func (m *MsgRemoveValidatorSelf) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.ValidatorAddress) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgRemoveValidatorSelfResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + func sovTx(x uint64) (n int) { return (math_bits.Len64(x|1) + 6) / 7 } @@ -1008,6 +1209,138 @@ func (m *MsgRemoveValidatorResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *MsgRemoveValidatorSelf) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgRemoveValidatorSelf: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRemoveValidatorSelf: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ValidatorAddress = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *MsgRemoveValidatorSelfResponse) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgRemoveValidatorSelfResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgRemoveValidatorSelfResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthTx + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipTx(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 From 453c00b7036f738d49b648227838aab249832da3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Thu, 18 Jun 2026 16:47:40 +0200 Subject: [PATCH 2/6] fix(poa): log GetValidator error on validator self-removal --- x/poa/keeper/keeper.go | 1 + 1 file changed, 1 insertion(+) diff --git a/x/poa/keeper/keeper.go b/x/poa/keeper/keeper.go index 8cdd29f3..48e1899e 100644 --- a/x/poa/keeper/keeper.go +++ b/x/poa/keeper/keeper.go @@ -298,6 +298,7 @@ func (k Keeper) ExecuteRemoveValidatorSelf(ctx sdk.Context, validatorAddress str validator, err := k.sk.GetValidator(ctx, valAddress) if err != nil { + ctx.Logger().Warn("Error getting validator", "error", err) return types.ErrAddressIsNotAValidator } From ae63a8d7766a95152ee5325eadff5970970e445d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Fri, 19 Jun 2026 12:32:12 +0200 Subject: [PATCH 3/6] refactor(poa): rename to SelfRemoveValidator and drop last-validator guard --- proto/poa/tx.proto | 14 +- x/poa/keeper/keeper.go | 26 +-- .../msg_server_remove_validator_self.go | 18 -- .../msg_server_self_remove_validator.go | 18 ++ ... msg_server_self_remove_validator_test.go} | 19 +- x/poa/types/codec.go | 4 +- x/poa/types/errors.go | 1 - x/poa/types/events.go | 2 +- x/poa/types/message_remove_validator_self.go | 13 -- x/poa/types/message_self_remove_validator.go | 13 ++ x/poa/types/tx.pb.go | 216 +++++++++--------- 11 files changed, 155 insertions(+), 189 deletions(-) delete mode 100644 x/poa/keeper/msg_server_remove_validator_self.go create mode 100644 x/poa/keeper/msg_server_self_remove_validator.go rename x/poa/keeper/{msg_server_remove_validator_self_test.go => msg_server_self_remove_validator_test.go} (78%) delete mode 100644 x/poa/types/message_remove_validator_self.go create mode 100644 x/poa/types/message_self_remove_validator.go diff --git a/proto/poa/tx.proto b/proto/poa/tx.proto index 6fe01a3b..90734d93 100644 --- a/proto/poa/tx.proto +++ b/proto/poa/tx.proto @@ -19,7 +19,7 @@ service Msg { // Removes an existing validator from the authority rpc RemoveValidator(MsgRemoveValidator) returns (MsgRemoveValidatorResponse); // Allows a validator to remove itself from the authority - rpc RemoveValidatorSelf(MsgRemoveValidatorSelf) returns (MsgRemoveValidatorSelfResponse); + rpc SelfRemoveValidator(MsgSelfRemoveValidator) returns (MsgSelfRemoveValidatorResponse); } // MsgAddValidator defines a message for adding a new validator @@ -49,13 +49,13 @@ message MsgRemoveValidator { // validator message MsgRemoveValidatorResponse {} -// MsgRemoveValidatorSelf defines a message for a validator to remove itself -message MsgRemoveValidatorSelf { - option (cosmos.msg.v1.signer) = "validator_address"; +// MsgSelfRemoveValidator defines a message for a validator to remove itself +message MsgSelfRemoveValidator { + option (cosmos.msg.v1.signer) = "address"; - string validator_address = 1 + string address = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; } -// MsgRemoveValidatorSelfResponse defines the response for a validator +// MsgSelfRemoveValidatorResponse defines the response for a validator // removing itself -message MsgRemoveValidatorSelfResponse {} +message MsgSelfRemoveValidatorResponse {} diff --git a/x/poa/keeper/keeper.go b/x/poa/keeper/keeper.go index 48e1899e..cc40f1fe 100644 --- a/x/poa/keeper/keeper.go +++ b/x/poa/keeper/keeper.go @@ -289,7 +289,7 @@ func (k Keeper) ExecuteRemoveValidator(ctx sdk.Context, validatorAddress string) return nil } -func (k Keeper) ExecuteRemoveValidatorSelf(ctx sdk.Context, validatorAddress string) error { +func (k Keeper) ExecuteSelfRemoveValidator(ctx sdk.Context, validatorAddress string) error { accAddress, err := sdk.AccAddressFromBech32(validatorAddress) if err != nil { return err @@ -302,28 +302,6 @@ func (k Keeper) ExecuteRemoveValidatorSelf(ctx sdk.Context, validatorAddress str return types.ErrAddressIsNotAValidator } - // Prevent the last bonded validator from removing itself. If it is not bonded, the - // set will not be left empty by its removal. - if validator.IsBonded() { - validators, err := k.sk.GetAllValidators(ctx) - if err != nil { - return err - } - - bondedValidators := 0 - for _, v := range validators { - if v.IsBonded() { - bondedValidators++ - } - if bondedValidators > 1 { - break - } - } - if bondedValidators <= 1 { - return types.ErrCannotRemoveLastValidator - } - } - err = k.ExecuteRemoveValidator(ctx, valAddress.String()) if err != nil { return err @@ -331,7 +309,7 @@ func (k Keeper) ExecuteRemoveValidatorSelf(ctx sdk.Context, validatorAddress str ctx.EventManager().EmitEvent( sdk.NewEvent( - types.EventTypeRemoveValidatorSelf, + types.EventTypeSelfRemoveValidator, sdk.NewAttribute(types.AttributeValidator, valAddress.String()), sdk.NewAttribute(types.AttributeHeight, fmt.Sprintf("%d", ctx.BlockHeight())), sdk.NewAttribute(types.AttributeStakingTokens, fmt.Sprintf("%d", validator.Tokens)), diff --git a/x/poa/keeper/msg_server_remove_validator_self.go b/x/poa/keeper/msg_server_remove_validator_self.go deleted file mode 100644 index b9597b56..00000000 --- a/x/poa/keeper/msg_server_remove_validator_self.go +++ /dev/null @@ -1,18 +0,0 @@ -package keeper - -import ( - "context" - - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/xrplevm/node/v10/x/poa/types" -) - -func (k msgServer) RemoveValidatorSelf(goCtx context.Context, msg *types.MsgRemoveValidatorSelf) (*types.MsgRemoveValidatorSelfResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - err := k.ExecuteRemoveValidatorSelf(ctx, msg.ValidatorAddress) - if err != nil { - return nil, err - } - - return &types.MsgRemoveValidatorSelfResponse{}, nil -} diff --git a/x/poa/keeper/msg_server_self_remove_validator.go b/x/poa/keeper/msg_server_self_remove_validator.go new file mode 100644 index 00000000..33f12523 --- /dev/null +++ b/x/poa/keeper/msg_server_self_remove_validator.go @@ -0,0 +1,18 @@ +package keeper + +import ( + "context" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/xrplevm/node/v10/x/poa/types" +) + +func (k msgServer) SelfRemoveValidator(goCtx context.Context, msg *types.MsgSelfRemoveValidator) (*types.MsgSelfRemoveValidatorResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + err := k.ExecuteSelfRemoveValidator(ctx, msg.Address) + if err != nil { + return nil, err + } + + return &types.MsgSelfRemoveValidatorResponse{}, nil +} diff --git a/x/poa/keeper/msg_server_remove_validator_self_test.go b/x/poa/keeper/msg_server_self_remove_validator_test.go similarity index 78% rename from x/poa/keeper/msg_server_remove_validator_self_test.go rename to x/poa/keeper/msg_server_self_remove_validator_test.go index 228187ff..165523a8 100644 --- a/x/poa/keeper/msg_server_remove_validator_self_test.go +++ b/x/poa/keeper/msg_server_self_remove_validator_test.go @@ -13,7 +13,7 @@ import ( "go.uber.org/mock/gomock" ) -func TestMsgServer_RemoveValidatorSelf(t *testing.T) { +func TestMsgServer_SelfRemoveValidator(t *testing.T) { ctrl := gomock.NewController(t) const validatorAddress = "ethm1wunfhl05vc8r8xxnnp8gt62wa54r6y52pg03zq" @@ -42,22 +42,11 @@ func TestMsgServer_RemoveValidatorSelf(t *testing.T) { bankMocks: func(_ sdk.Context, _ *testutil.MockBankKeeper) {}, expectedErr: types.ErrAddressIsNotAValidator, }, - { - name: "should fail - last bonded validator cannot self-remove", - validatorAddress: validatorAddress, - stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) { - stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(bondedValidator, nil) - stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{bondedValidator}, nil) - }, - bankMocks: func(_ sdk.Context, _ *testutil.MockBankKeeper) {}, - expectedErr: types.ErrCannotRemoveLastValidator, - }, { name: "should pass - reuses the RemoveValidator logic", validatorAddress: validatorAddress, stakingMocks: func(ctx sdk.Context, stakingKeeper *testutil.MockStakingKeeper) { stakingKeeper.EXPECT().GetValidator(ctx, gomock.Any()).Return(bondedValidator, nil).Times(2) - stakingKeeper.EXPECT().GetAllValidators(ctx).Return([]stakingtypes.Validator{bondedValidator, bondedValidator}, nil) stakingKeeper.EXPECT().GetParams(ctx).Return(stakingtypes.Params{BondDenom: "BND"}, nil) stakingKeeper.EXPECT().GetUnbondingDelegationsFromValidator(ctx, gomock.Any()).Return([]stakingtypes.UnbondingDelegation{}, nil) @@ -82,11 +71,11 @@ func TestMsgServer_RemoveValidatorSelf(t *testing.T) { msgServer := NewMsgServerImpl(*poaKeeper) - msg := &types.MsgRemoveValidatorSelf{ - ValidatorAddress: tc.validatorAddress, + msg := &types.MsgSelfRemoveValidator{ + Address: tc.validatorAddress, } - _, err := msgServer.RemoveValidatorSelf(ctx, msg) + _, err := msgServer.SelfRemoveValidator(ctx, msg) if tc.expectedErr != nil { require.Error(t, err) require.Contains(t, err.Error(), tc.expectedErr.Error()) diff --git a/x/poa/types/codec.go b/x/poa/types/codec.go index 53f8e439..f41ef04a 100644 --- a/x/poa/types/codec.go +++ b/x/poa/types/codec.go @@ -11,7 +11,7 @@ import ( func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgAddValidator{}, "poa/AddValidator", nil) cdc.RegisterConcrete(&MsgRemoveValidator{}, "poa/RemoveValidator", nil) - cdc.RegisterConcrete(&MsgRemoveValidatorSelf{}, "poa/RemoveValidatorSelf", nil) + cdc.RegisterConcrete(&MsgSelfRemoveValidator{}, "poa/SelfRemoveValidator", nil) // this line is used by starport scaffolding # 2 } @@ -23,7 +23,7 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { &MsgRemoveValidator{}, ) registry.RegisterImplementations((*sdk.Msg)(nil), - &MsgRemoveValidatorSelf{}, + &MsgSelfRemoveValidator{}, ) registry.RegisterImplementations( (*govtypes.Content)(nil), diff --git a/x/poa/types/errors.go b/x/poa/types/errors.go index 7ec70aab..af388423 100644 --- a/x/poa/types/errors.go +++ b/x/poa/types/errors.go @@ -15,5 +15,4 @@ var ( ErrInvalidValidatorStatus = sdkerrors.Register(ModuleName, 5, "invalid validator status") ErrAddressIsNotAValidator = sdkerrors.Register(ModuleName, 6, "address is not a validator") ErrMaxValidatorsReached = sdkerrors.Register(ModuleName, 7, "maximum number of validators reached") - ErrCannotRemoveLastValidator = sdkerrors.Register(ModuleName, 8, "cannot remove the last bonded validator") ) diff --git a/x/poa/types/events.go b/x/poa/types/events.go index 394c15df..9316dc1c 100644 --- a/x/poa/types/events.go +++ b/x/poa/types/events.go @@ -3,7 +3,7 @@ package types const ( EventTypeAddValidator = "add_validator" EventTypeRemoveValidator = "remove_validator" - EventTypeRemoveValidatorSelf = "remove_validator_self" + EventTypeSelfRemoveValidator = "self_remove_validator" AttributeValidator = "address" AttributeHeight = "height" AttributeStakingTokens = "staking_tokens" diff --git a/x/poa/types/message_remove_validator_self.go b/x/poa/types/message_remove_validator_self.go deleted file mode 100644 index ecdb6369..00000000 --- a/x/poa/types/message_remove_validator_self.go +++ /dev/null @@ -1,13 +0,0 @@ -package types - -import ( - sdk "github.com/cosmos/cosmos-sdk/types" -) - -var _ sdk.Msg = &MsgRemoveValidatorSelf{} - -func NewMsgRemoveValidatorSelf(address string) *MsgRemoveValidatorSelf { - return &MsgRemoveValidatorSelf{ - ValidatorAddress: address, - } -} diff --git a/x/poa/types/message_self_remove_validator.go b/x/poa/types/message_self_remove_validator.go new file mode 100644 index 00000000..1929cf07 --- /dev/null +++ b/x/poa/types/message_self_remove_validator.go @@ -0,0 +1,13 @@ +package types + +import ( + sdk "github.com/cosmos/cosmos-sdk/types" +) + +var _ sdk.Msg = &MsgSelfRemoveValidator{} + +func NewMsgSelfRemoveValidator(address string) *MsgSelfRemoveValidator { + return &MsgSelfRemoveValidator{ + Address: address, + } +} diff --git a/x/poa/types/tx.pb.go b/x/poa/types/tx.pb.go index 8e96f75d..9ee72c49 100644 --- a/x/poa/types/tx.pb.go +++ b/x/poa/types/tx.pb.go @@ -230,23 +230,23 @@ func (m *MsgRemoveValidatorResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgRemoveValidatorResponse proto.InternalMessageInfo -// MsgRemoveValidatorSelf defines a message for a validator to remove itself -type MsgRemoveValidatorSelf struct { - ValidatorAddress string `protobuf:"bytes,1,opt,name=validator_address,json=validatorAddress,proto3" json:"validator_address,omitempty"` +// MsgSelfRemoveValidator defines a message for a validator to remove itself +type MsgSelfRemoveValidator struct { + Address string `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` } -func (m *MsgRemoveValidatorSelf) Reset() { *m = MsgRemoveValidatorSelf{} } -func (m *MsgRemoveValidatorSelf) String() string { return proto.CompactTextString(m) } -func (*MsgRemoveValidatorSelf) ProtoMessage() {} -func (*MsgRemoveValidatorSelf) Descriptor() ([]byte, []int) { +func (m *MsgSelfRemoveValidator) Reset() { *m = MsgSelfRemoveValidator{} } +func (m *MsgSelfRemoveValidator) String() string { return proto.CompactTextString(m) } +func (*MsgSelfRemoveValidator) ProtoMessage() {} +func (*MsgSelfRemoveValidator) Descriptor() ([]byte, []int) { return fileDescriptor_8ac16a0aed23c2e2, []int{4} } -func (m *MsgRemoveValidatorSelf) XXX_Unmarshal(b []byte) error { +func (m *MsgSelfRemoveValidator) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRemoveValidatorSelf) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSelfRemoveValidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRemoveValidatorSelf.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSelfRemoveValidator.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -256,42 +256,42 @@ func (m *MsgRemoveValidatorSelf) XXX_Marshal(b []byte, deterministic bool) ([]by return b[:n], nil } } -func (m *MsgRemoveValidatorSelf) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRemoveValidatorSelf.Merge(m, src) +func (m *MsgSelfRemoveValidator) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSelfRemoveValidator.Merge(m, src) } -func (m *MsgRemoveValidatorSelf) XXX_Size() int { +func (m *MsgSelfRemoveValidator) XXX_Size() int { return m.Size() } -func (m *MsgRemoveValidatorSelf) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRemoveValidatorSelf.DiscardUnknown(m) +func (m *MsgSelfRemoveValidator) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSelfRemoveValidator.DiscardUnknown(m) } -var xxx_messageInfo_MsgRemoveValidatorSelf proto.InternalMessageInfo +var xxx_messageInfo_MsgSelfRemoveValidator proto.InternalMessageInfo -func (m *MsgRemoveValidatorSelf) GetValidatorAddress() string { +func (m *MsgSelfRemoveValidator) GetAddress() string { if m != nil { - return m.ValidatorAddress + return m.Address } return "" } -// MsgRemoveValidatorSelfResponse defines the response for a validator -// self-removal -type MsgRemoveValidatorSelfResponse struct { +// MsgSelfRemoveValidatorResponse defines the response for a validator +// removing itself +type MsgSelfRemoveValidatorResponse struct { } -func (m *MsgRemoveValidatorSelfResponse) Reset() { *m = MsgRemoveValidatorSelfResponse{} } -func (m *MsgRemoveValidatorSelfResponse) String() string { return proto.CompactTextString(m) } -func (*MsgRemoveValidatorSelfResponse) ProtoMessage() {} -func (*MsgRemoveValidatorSelfResponse) Descriptor() ([]byte, []int) { +func (m *MsgSelfRemoveValidatorResponse) Reset() { *m = MsgSelfRemoveValidatorResponse{} } +func (m *MsgSelfRemoveValidatorResponse) String() string { return proto.CompactTextString(m) } +func (*MsgSelfRemoveValidatorResponse) ProtoMessage() {} +func (*MsgSelfRemoveValidatorResponse) Descriptor() ([]byte, []int) { return fileDescriptor_8ac16a0aed23c2e2, []int{5} } -func (m *MsgRemoveValidatorSelfResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgSelfRemoveValidatorResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgRemoveValidatorSelfResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgSelfRemoveValidatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgRemoveValidatorSelfResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgSelfRemoveValidatorResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -301,65 +301,65 @@ func (m *MsgRemoveValidatorSelfResponse) XXX_Marshal(b []byte, deterministic boo return b[:n], nil } } -func (m *MsgRemoveValidatorSelfResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgRemoveValidatorSelfResponse.Merge(m, src) +func (m *MsgSelfRemoveValidatorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgSelfRemoveValidatorResponse.Merge(m, src) } -func (m *MsgRemoveValidatorSelfResponse) XXX_Size() int { +func (m *MsgSelfRemoveValidatorResponse) XXX_Size() int { return m.Size() } -func (m *MsgRemoveValidatorSelfResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgRemoveValidatorSelfResponse.DiscardUnknown(m) +func (m *MsgSelfRemoveValidatorResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgSelfRemoveValidatorResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgRemoveValidatorSelfResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgSelfRemoveValidatorResponse proto.InternalMessageInfo func init() { proto.RegisterType((*MsgAddValidator)(nil), "poa.MsgAddValidator") proto.RegisterType((*MsgAddValidatorResponse)(nil), "poa.MsgAddValidatorResponse") proto.RegisterType((*MsgRemoveValidator)(nil), "poa.MsgRemoveValidator") proto.RegisterType((*MsgRemoveValidatorResponse)(nil), "poa.MsgRemoveValidatorResponse") - proto.RegisterType((*MsgRemoveValidatorSelf)(nil), "poa.MsgRemoveValidatorSelf") - proto.RegisterType((*MsgRemoveValidatorSelfResponse)(nil), "poa.MsgRemoveValidatorSelfResponse") + proto.RegisterType((*MsgSelfRemoveValidator)(nil), "poa.MsgSelfRemoveValidator") + proto.RegisterType((*MsgSelfRemoveValidatorResponse)(nil), "poa.MsgSelfRemoveValidatorResponse") } func init() { proto.RegisterFile("poa/tx.proto", fileDescriptor_8ac16a0aed23c2e2) } var fileDescriptor_8ac16a0aed23c2e2 = []byte{ - // 538 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x94, 0x4f, 0x6b, 0x13, 0x41, - 0x18, 0xc6, 0xb3, 0x8d, 0x16, 0x32, 0x2d, 0xd6, 0xae, 0xa1, 0xd9, 0xae, 0x75, 0x1b, 0x52, 0xc1, - 0x52, 0x70, 0xc6, 0x54, 0xf0, 0xe0, 0x2d, 0x41, 0x3d, 0x58, 0x02, 0x65, 0x0b, 0x0a, 0x5e, 0xca, - 0x6c, 0x76, 0x3a, 0x5d, 0x9a, 0xdd, 0x77, 0xd8, 0x99, 0xc4, 0xec, 0x4d, 0xfc, 0x04, 0x7e, 0x07, - 0x2f, 0x1e, 0x7b, 0xf0, 0xee, 0xb5, 0x78, 0x2a, 0x9e, 0x3c, 0x89, 0x24, 0x87, 0x7e, 0x03, 0xcf, - 0xb2, 0xff, 0x12, 0x4d, 0xb2, 0x82, 0xf4, 0x92, 0xec, 0x3b, 0xbf, 0x79, 0x9f, 0x7d, 0xde, 0x67, - 0x86, 0x45, 0xab, 0x02, 0x28, 0x51, 0x43, 0x2c, 0x42, 0x50, 0xa0, 0x97, 0x05, 0x50, 0xb3, 0xca, - 0x81, 0x43, 0x52, 0x93, 0xf8, 0x29, 0x45, 0xe6, 0x66, 0x17, 0xa4, 0x0f, 0xf2, 0x38, 0x05, 0x69, - 0x91, 0xa1, 0x5a, 0x5a, 0x11, 0x5f, 0x72, 0x32, 0x68, 0xc6, 0x7f, 0x19, 0xb8, 0x9f, 0x01, 0xa9, - 0xe8, 0x99, 0x17, 0xc4, 0xd0, 0x61, 0x8a, 0x36, 0xf3, 0x3a, 0x57, 0xe6, 0x00, 0xbc, 0xc7, 0x48, - 0x52, 0x39, 0xfd, 0x13, 0x42, 0x83, 0x28, 0x43, 0xeb, 0xd4, 0xf7, 0x02, 0x20, 0xc9, 0x6f, 0xba, - 0xd4, 0xf8, 0xb2, 0x84, 0xd6, 0x3a, 0x92, 0xb7, 0x5c, 0xf7, 0x15, 0xed, 0x79, 0x2e, 0x55, 0x10, - 0xea, 0x4f, 0x50, 0x85, 0xf6, 0xd5, 0x29, 0x84, 0x9e, 0x8a, 0x0c, 0xad, 0xae, 0xed, 0x56, 0xda, - 0xc6, 0xb7, 0xcf, 0x0f, 0xab, 0x99, 0xcb, 0x96, 0xeb, 0x86, 0x4c, 0xca, 0x23, 0x15, 0x7a, 0x01, - 0xb7, 0xa7, 0x5b, 0xf5, 0x97, 0x68, 0x7d, 0x90, 0x8b, 0x1c, 0xd3, 0x74, 0x97, 0xb1, 0x94, 0xf4, - 0xdf, 0x2b, 0xea, 0xff, 0x74, 0x75, 0xbe, 0x57, 0xb2, 0x6f, 0x4f, 0xfa, 0x32, 0xa8, 0x1f, 0xa2, - 0x15, 0x97, 0xc9, 0x6e, 0xe8, 0x09, 0xe5, 0x41, 0x60, 0x94, 0xeb, 0xda, 0xee, 0xca, 0xfe, 0x0e, - 0xce, 0x24, 0xf2, 0x89, 0xb3, 0x04, 0xf0, 0xb3, 0xe9, 0xd6, 0x76, 0xe5, 0xe2, 0xc7, 0x76, 0x29, - 0x96, 0xd5, 0xec, 0x3f, 0x25, 0xf4, 0x17, 0x68, 0x59, 0xf4, 0x9d, 0x33, 0x16, 0x19, 0x37, 0x12, - 0xb1, 0x2a, 0x4e, 0x83, 0xc2, 0x79, 0x50, 0xb8, 0x15, 0x44, 0x6d, 0xe3, 0xeb, 0xd4, 0x68, 0x37, - 0x8c, 0x84, 0x02, 0x7c, 0xd8, 0x77, 0x0e, 0x58, 0x64, 0x67, 0xdd, 0x4f, 0x6f, 0xbd, 0xbf, 0x3a, - 0xdf, 0x9b, 0x4e, 0xdd, 0xd8, 0x44, 0xb5, 0x99, 0x00, 0x6d, 0x26, 0x05, 0x04, 0x92, 0x35, 0x3e, - 0x6a, 0x48, 0xef, 0x48, 0x6e, 0x33, 0x1f, 0x06, 0xec, 0xfa, 0xf9, 0x3e, 0x2f, 0xce, 0xb7, 0xb8, - 0x7f, 0x2e, 0xda, 0xb9, 0x01, 0xb6, 0x90, 0x39, 0x6f, 0x72, 0x32, 0xc3, 0x5b, 0xb4, 0x31, 0x4f, - 0x8f, 0x58, 0xef, 0x64, 0xb1, 0x1d, 0xed, 0xbf, 0xed, 0x6c, 0xc4, 0x76, 0xe6, 0x95, 0x1a, 0x75, - 0x64, 0x2d, 0x7e, 0x71, 0x6e, 0x6d, 0xff, 0x97, 0x86, 0xca, 0x1d, 0xc9, 0xf5, 0x36, 0x5a, 0xfd, - 0xeb, 0xfe, 0x56, 0xb1, 0x00, 0x8a, 0x67, 0x0e, 0xc5, 0xdc, 0x5a, 0xb4, 0x9a, 0x6b, 0xe9, 0x07, - 0x68, 0x6d, 0xf6, 0x98, 0x6a, 0x79, 0xc3, 0x0c, 0x30, 0xb7, 0x0b, 0xc0, 0x44, 0xec, 0x35, 0xba, - 0xb3, 0x28, 0xb0, 0xbb, 0x05, 0x7d, 0x31, 0x34, 0x77, 0xfe, 0x01, 0x73, 0x61, 0xf3, 0xe6, 0xbb, - 0xf8, 0x5e, 0xb7, 0x5b, 0x17, 0x23, 0x4b, 0xbb, 0x1c, 0x59, 0xda, 0xcf, 0x91, 0xa5, 0x7d, 0x18, - 0x5b, 0xa5, 0xcb, 0xb1, 0x55, 0xfa, 0x3e, 0xb6, 0x4a, 0x6f, 0x1e, 0x70, 0x4f, 0x9d, 0xf6, 0x1d, - 0xdc, 0x05, 0x9f, 0x0c, 0x43, 0xd1, 0x63, 0x03, 0x9f, 0x04, 0xe0, 0x32, 0x32, 0x68, 0x3e, 0x22, - 0x43, 0x92, 0x7c, 0x9d, 0x22, 0xc1, 0xa4, 0xb3, 0x9c, 0xdc, 0xfa, 0xc7, 0xbf, 0x03, 0x00, 0x00, - 0xff, 0xff, 0xf5, 0x69, 0x13, 0xe3, 0xb1, 0x04, 0x00, 0x00, + // 542 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x54, 0xbf, 0x6f, 0xd3, 0x40, + 0x14, 0x8e, 0x1b, 0x28, 0xca, 0x35, 0xa2, 0xd4, 0x44, 0xc4, 0x35, 0xc5, 0x8d, 0x52, 0x24, 0xaa, + 0x4a, 0xf8, 0x48, 0x90, 0x18, 0xba, 0x25, 0x02, 0x06, 0xaa, 0x48, 0x95, 0x2b, 0x81, 0xd4, 0xa5, + 0x3a, 0xc7, 0xd7, 0xab, 0xd5, 0xd8, 0xef, 0xe4, 0xbb, 0x44, 0xf1, 0x86, 0xf8, 0x0b, 0xf8, 0x1f, + 0x58, 0x18, 0x3b, 0xb0, 0xb3, 0x56, 0x4c, 0x15, 0x13, 0x13, 0x42, 0xc9, 0xd0, 0xff, 0x80, 0x19, + 0xf9, 0xc7, 0x25, 0x90, 0x1f, 0x30, 0xb0, 0xd8, 0x7e, 0xf7, 0xbd, 0xef, 0xbb, 0xf7, 0x7d, 0x7a, + 0x32, 0x2a, 0x73, 0x20, 0x58, 0x0e, 0x6d, 0x1e, 0x81, 0x04, 0xbd, 0xc8, 0x81, 0x98, 0x15, 0x06, + 0x0c, 0xd2, 0x1a, 0x27, 0x5f, 0x19, 0x64, 0x6e, 0x76, 0x41, 0x04, 0x20, 0x4e, 0x32, 0x20, 0x2b, + 0x72, 0xa8, 0x9a, 0x55, 0x38, 0x10, 0x0c, 0x0f, 0x1a, 0xc9, 0x2b, 0x07, 0x1e, 0xe6, 0x80, 0x90, + 0xe4, 0xdc, 0x0f, 0x13, 0xd0, 0xa5, 0x92, 0x34, 0x54, 0xad, 0x94, 0x19, 0x00, 0xeb, 0x51, 0x9c, + 0x56, 0x6e, 0xff, 0x14, 0x93, 0x30, 0xce, 0xa1, 0x0d, 0x12, 0xf8, 0x21, 0xe0, 0xf4, 0x99, 0x1d, + 0xd5, 0x3f, 0xaf, 0xa0, 0xf5, 0x8e, 0x60, 0x2d, 0xcf, 0x7b, 0x4d, 0x7a, 0xbe, 0x47, 0x24, 0x44, + 0xfa, 0x33, 0x54, 0x22, 0x7d, 0x79, 0x06, 0x91, 0x2f, 0x63, 0x43, 0xab, 0x69, 0xbb, 0xa5, 0xb6, + 0xf1, 0xf5, 0xd3, 0xe3, 0x4a, 0x3e, 0x65, 0xcb, 0xf3, 0x22, 0x2a, 0xc4, 0x91, 0x8c, 0xfc, 0x90, + 0x39, 0xd3, 0x56, 0xfd, 0x15, 0xda, 0x18, 0x28, 0x91, 0x13, 0x92, 0x75, 0x19, 0x2b, 0x29, 0xff, + 0xc1, 0x32, 0xfe, 0xc7, 0xeb, 0x8b, 0xbd, 0x82, 0x73, 0x67, 0xc2, 0xcb, 0x41, 0xfd, 0x10, 0xad, + 0x79, 0x54, 0x74, 0x23, 0x9f, 0x4b, 0x1f, 0x42, 0xa3, 0x58, 0xd3, 0x76, 0xd7, 0x9a, 0x3b, 0x76, + 0x2e, 0xa1, 0x1c, 0xe7, 0x09, 0xd8, 0xcf, 0xa7, 0xad, 0xed, 0xd2, 0xe5, 0xf7, 0xed, 0x42, 0x22, + 0xab, 0x39, 0xbf, 0x4b, 0xe8, 0x2f, 0xd1, 0x2a, 0xef, 0xbb, 0xe7, 0x34, 0x36, 0x6e, 0xa4, 0x62, + 0x15, 0x3b, 0x0b, 0xca, 0x56, 0x41, 0xd9, 0xad, 0x30, 0x6e, 0x1b, 0x5f, 0xa6, 0x83, 0x76, 0xa3, + 0x98, 0x4b, 0xb0, 0x0f, 0xfb, 0xee, 0x01, 0x8d, 0x9d, 0x9c, 0xbd, 0x7f, 0xfb, 0xdd, 0xf5, 0xc5, + 0xde, 0xd4, 0x75, 0x7d, 0x13, 0x55, 0x67, 0x02, 0x74, 0xa8, 0xe0, 0x10, 0x0a, 0x5a, 0xff, 0xa0, + 0x21, 0xbd, 0x23, 0x98, 0x43, 0x03, 0x18, 0xd0, 0xff, 0xcf, 0xf7, 0xc5, 0xf2, 0x7c, 0x97, 0xf3, + 0xe7, 0xa2, 0x9d, 0x33, 0xb0, 0x85, 0xcc, 0xf9, 0x21, 0x27, 0x1e, 0x8e, 0xd1, 0xbd, 0x8e, 0x60, + 0x47, 0xb4, 0x77, 0x3a, 0x6b, 0xa3, 0x89, 0x6e, 0xa9, 0x21, 0xfe, 0x65, 0x42, 0x35, 0xee, 0x97, + 0x93, 0xbb, 0x55, 0x55, 0xaf, 0x21, 0x6b, 0xb1, 0xb6, 0xba, 0xbd, 0xf9, 0x53, 0x43, 0xc5, 0x8e, + 0x60, 0x7a, 0x1b, 0x95, 0xff, 0x58, 0xd1, 0x8a, 0xcd, 0x81, 0xd8, 0x33, 0xb9, 0x9b, 0x5b, 0x8b, + 0x4e, 0x95, 0x96, 0x7e, 0x80, 0xd6, 0x67, 0x2d, 0x54, 0x15, 0x61, 0x06, 0x30, 0xb7, 0x97, 0x00, + 0x13, 0xb1, 0x37, 0xe8, 0xee, 0xa2, 0x4c, 0xee, 0x2b, 0xde, 0x02, 0xd0, 0xdc, 0xf9, 0x0b, 0xa8, + 0x84, 0xcd, 0x9b, 0x6f, 0x93, 0xd5, 0x6d, 0xb7, 0x2e, 0x47, 0x96, 0x76, 0x35, 0xb2, 0xb4, 0x1f, + 0x23, 0x4b, 0x7b, 0x3f, 0xb6, 0x0a, 0x57, 0x63, 0xab, 0xf0, 0x6d, 0x6c, 0x15, 0x8e, 0x1f, 0x31, + 0x5f, 0x9e, 0xf5, 0x5d, 0xbb, 0x0b, 0x01, 0x1e, 0x46, 0xbc, 0x47, 0x07, 0x01, 0x0e, 0xc1, 0xa3, + 0x78, 0xd0, 0x78, 0x82, 0x87, 0x38, 0xfd, 0x01, 0xc5, 0x9c, 0x0a, 0x77, 0x35, 0x5d, 0xec, 0xa7, + 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x36, 0x79, 0xc9, 0x4e, 0x94, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -378,8 +378,8 @@ type MsgClient interface { AddValidator(ctx context.Context, in *MsgAddValidator, opts ...grpc.CallOption) (*MsgAddValidatorResponse, error) // Removes an existing validator from the authority RemoveValidator(ctx context.Context, in *MsgRemoveValidator, opts ...grpc.CallOption) (*MsgRemoveValidatorResponse, error) - // Allows a validator to remove itself by unbonding its self-delegation - RemoveValidatorSelf(ctx context.Context, in *MsgRemoveValidatorSelf, opts ...grpc.CallOption) (*MsgRemoveValidatorSelfResponse, error) + // Allows a validator to remove itself from the authority + SelfRemoveValidator(ctx context.Context, in *MsgSelfRemoveValidator, opts ...grpc.CallOption) (*MsgSelfRemoveValidatorResponse, error) } type msgClient struct { @@ -408,9 +408,9 @@ func (c *msgClient) RemoveValidator(ctx context.Context, in *MsgRemoveValidator, return out, nil } -func (c *msgClient) RemoveValidatorSelf(ctx context.Context, in *MsgRemoveValidatorSelf, opts ...grpc.CallOption) (*MsgRemoveValidatorSelfResponse, error) { - out := new(MsgRemoveValidatorSelfResponse) - err := c.cc.Invoke(ctx, "/poa.Msg/RemoveValidatorSelf", in, out, opts...) +func (c *msgClient) SelfRemoveValidator(ctx context.Context, in *MsgSelfRemoveValidator, opts ...grpc.CallOption) (*MsgSelfRemoveValidatorResponse, error) { + out := new(MsgSelfRemoveValidatorResponse) + err := c.cc.Invoke(ctx, "/poa.Msg/SelfRemoveValidator", in, out, opts...) if err != nil { return nil, err } @@ -423,8 +423,8 @@ type MsgServer interface { AddValidator(context.Context, *MsgAddValidator) (*MsgAddValidatorResponse, error) // Removes an existing validator from the authority RemoveValidator(context.Context, *MsgRemoveValidator) (*MsgRemoveValidatorResponse, error) - // Allows a validator to remove itself - RemoveValidatorSelf(context.Context, *MsgRemoveValidatorSelf) (*MsgRemoveValidatorSelfResponse, error) + // Allows a validator to remove itself from the authority + SelfRemoveValidator(context.Context, *MsgSelfRemoveValidator) (*MsgSelfRemoveValidatorResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. @@ -437,8 +437,8 @@ func (*UnimplementedMsgServer) AddValidator(ctx context.Context, req *MsgAddVali func (*UnimplementedMsgServer) RemoveValidator(ctx context.Context, req *MsgRemoveValidator) (*MsgRemoveValidatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RemoveValidator not implemented") } -func (*UnimplementedMsgServer) RemoveValidatorSelf(ctx context.Context, req *MsgRemoveValidatorSelf) (*MsgRemoveValidatorSelfResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method RemoveValidatorSelf not implemented") +func (*UnimplementedMsgServer) SelfRemoveValidator(ctx context.Context, req *MsgSelfRemoveValidator) (*MsgSelfRemoveValidatorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method SelfRemoveValidator not implemented") } func RegisterMsgServer(s grpc1.Server, srv MsgServer) { @@ -481,20 +481,20 @@ func _Msg_RemoveValidator_Handler(srv interface{}, ctx context.Context, dec func return interceptor(ctx, in, info, handler) } -func _Msg_RemoveValidatorSelf_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgRemoveValidatorSelf) +func _Msg_SelfRemoveValidator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgSelfRemoveValidator) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).RemoveValidatorSelf(ctx, in) + return srv.(MsgServer).SelfRemoveValidator(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/poa.Msg/RemoveValidatorSelf", + FullMethod: "/poa.Msg/SelfRemoveValidator", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).RemoveValidatorSelf(ctx, req.(*MsgRemoveValidatorSelf)) + return srv.(MsgServer).SelfRemoveValidator(ctx, req.(*MsgSelfRemoveValidator)) } return interceptor(ctx, in, info, handler) } @@ -512,8 +512,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_RemoveValidator_Handler, }, { - MethodName: "RemoveValidatorSelf", - Handler: _Msg_RemoveValidatorSelf_Handler, + MethodName: "SelfRemoveValidator", + Handler: _Msg_SelfRemoveValidator_Handler, }, }, Streams: []grpc.StreamDesc{}, @@ -662,7 +662,7 @@ func (m *MsgRemoveValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *MsgRemoveValidatorSelf) Marshal() (dAtA []byte, err error) { +func (m *MsgSelfRemoveValidator) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -672,27 +672,27 @@ func (m *MsgRemoveValidatorSelf) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRemoveValidatorSelf) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSelfRemoveValidator) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRemoveValidatorSelf) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSelfRemoveValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.ValidatorAddress) > 0 { - i -= len(m.ValidatorAddress) - copy(dAtA[i:], m.ValidatorAddress) - i = encodeVarintTx(dAtA, i, uint64(len(m.ValidatorAddress))) + if len(m.Address) > 0 { + i -= len(m.Address) + copy(dAtA[i:], m.Address) + i = encodeVarintTx(dAtA, i, uint64(len(m.Address))) i-- dAtA[i] = 0xa } return len(dAtA) - i, nil } -func (m *MsgRemoveValidatorSelfResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgSelfRemoveValidatorResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -702,12 +702,12 @@ func (m *MsgRemoveValidatorSelfResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgRemoveValidatorSelfResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgSelfRemoveValidatorResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgRemoveValidatorSelfResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgSelfRemoveValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -784,20 +784,20 @@ func (m *MsgRemoveValidatorResponse) Size() (n int) { return n } -func (m *MsgRemoveValidatorSelf) Size() (n int) { +func (m *MsgSelfRemoveValidator) Size() (n int) { if m == nil { return 0 } var l int _ = l - l = len(m.ValidatorAddress) + l = len(m.Address) if l > 0 { n += 1 + l + sovTx(uint64(l)) } return n } -func (m *MsgRemoveValidatorSelfResponse) Size() (n int) { +func (m *MsgSelfRemoveValidatorResponse) Size() (n int) { if m == nil { return 0 } @@ -1209,7 +1209,7 @@ func (m *MsgRemoveValidatorResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRemoveValidatorSelf) Unmarshal(dAtA []byte) error { +func (m *MsgSelfRemoveValidator) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1232,15 +1232,15 @@ func (m *MsgRemoveValidatorSelf) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRemoveValidatorSelf: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSelfRemoveValidator: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRemoveValidatorSelf: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSelfRemoveValidator: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ValidatorAddress", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -1268,7 +1268,7 @@ func (m *MsgRemoveValidatorSelf) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ValidatorAddress = string(dAtA[iNdEx:postIndex]) + m.Address = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex default: iNdEx = preIndex @@ -1291,7 +1291,7 @@ func (m *MsgRemoveValidatorSelf) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgRemoveValidatorSelfResponse) Unmarshal(dAtA []byte) error { +func (m *MsgSelfRemoveValidatorResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -1314,10 +1314,10 @@ func (m *MsgRemoveValidatorSelfResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgRemoveValidatorSelfResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgSelfRemoveValidatorResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgRemoveValidatorSelfResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgSelfRemoveValidatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: From 0c66f64e87d38473167b18877832a215fc9bc212 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Mon, 22 Jun 2026 16:14:33 +0200 Subject: [PATCH 4/6] test(poa): add self-remove validator integration test --- tests/integration/poa_test.go | 84 +++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/tests/integration/poa_test.go b/tests/integration/poa_test.go index a7b7f7d3..b1fdfe37 100644 --- a/tests/integration/poa_test.go +++ b/tests/integration/poa_test.go @@ -14,6 +14,7 @@ import ( govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/cosmos/evm/testutil/integration/base/factory" "github.com/stretchr/testify/require" "github.com/xrplevm/node/v10/testutil/integration/exrp/utils" poatypes "github.com/xrplevm/node/v10/x/poa/types" @@ -592,6 +593,89 @@ func (s *TestSuite) TestAddValidator_MaximumValidators() { } } +func (s *TestSuite) TestSelfRemoveValidator_ExistingValidator_StatusBonded() { + validators := s.Network().GetValidators() + require.NotZero(s.T(), len(validators)) + + valIndex := 0 + validator := validators[valIndex] + valAddr, err := sdktypes.ValAddressFromBech32(validator.OperatorAddress) + require.NoError(s.T(), err) + + valKey := s.keyring.GetKey(valIndex) + require.Equal(s.T(), valAddr, sdktypes.ValAddress(valKey.AccAddr)) + + tt := []struct { + name string + beforeRun func() + afterRun func() + }{ + { + name: "self remove existing validator - status bonded", + beforeRun: func() { + resVal, err := s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.NoError(s.T(), err) + + require.Equal(s.T(), resVal.Validator.Status, stakingtypes.Bonded) + require.Equal(s.T(), sdktypes.DefaultPowerReduction.ToLegacyDec(), resVal.Validator.DelegatorShares) + require.NotZero(s.T(), resVal.Validator.Tokens) + }, + afterRun: func() { + resVal, err := s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.NoError(s.T(), err) + + require.True(s.T(), + resVal.Validator.DelegatorShares.IsZero(), + "delegator shares should be zero, got %s", + resVal.Validator.DelegatorShares, + ) + require.True(s.T(), resVal.Validator.Tokens.IsZero()) + require.Equal(s.T(), resVal.Validator.Status, stakingtypes.Unbonding) + + require.NoError(s.T(), s.Network().NextBlockAfter(stakingtypes.DefaultUnbondingTime)) + + _, err = s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.Contains(s.T(), err.Error(), fmt.Sprintf("validator %s not found", valAddr.String())) + }, + }, + } + + for _, tc := range tt { + s.Run(tc.name, func() { + if tc.beforeRun != nil { + tc.beforeRun() + } + + msg := poatypes.NewMsgSelfRemoveValidator(valKey.AccAddr.String()) + + res, err := s.factory.CommitCosmosTx(valKey.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{msg}, + }) + require.NoError(s.T(), err) + require.Equal(s.T(), uint32(0), res.Code, res.Log) + + if tc.afterRun != nil { + tc.afterRun() + } + }) + } +} + // RemoveValidator tests func (s *TestSuite) TestRemoveValidator_UnexistingValidator() { From 5015bbc4b81a279ee8a5f73e210496ccc4a36191 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Tue, 23 Jun 2026 07:18:40 +0200 Subject: [PATCH 5/6] test(poa): consolidate self-remove test cases --- tests/integration/poa_test.go | 247 +++++++++++++++++++++++++++++----- 1 file changed, 213 insertions(+), 34 deletions(-) diff --git a/tests/integration/poa_test.go b/tests/integration/poa_test.go index b1fdfe37..dcb77958 100644 --- a/tests/integration/poa_test.go +++ b/tests/integration/poa_test.go @@ -5,16 +5,20 @@ import ( "math/rand" "time" + sdkmath "cosmossdk.io/math" abcitypes "github.com/cometbft/cometbft/abci/types" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdktypes "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/cosmos/evm/testutil/integration/base/factory" + "github.com/cosmos/evm/testutil/keyring" "github.com/stretchr/testify/require" "github.com/xrplevm/node/v10/testutil/integration/exrp/utils" poatypes "github.com/xrplevm/node/v10/x/poa/types" @@ -593,26 +597,19 @@ func (s *TestSuite) TestAddValidator_MaximumValidators() { } } -func (s *TestSuite) TestSelfRemoveValidator_ExistingValidator_StatusBonded() { - validators := s.Network().GetValidators() - require.NotZero(s.T(), len(validators)) - - valIndex := 0 - validator := validators[valIndex] - valAddr, err := sdktypes.ValAddressFromBech32(validator.OperatorAddress) - require.NoError(s.T(), err) - - valKey := s.keyring.GetKey(valIndex) - require.Equal(s.T(), valAddr, sdktypes.ValAddress(valKey.AccAddr)) +// SelfRemoveValidator tests +func (s *TestSuite) TestSelfRemoveValidator_ExistingValidator() { tt := []struct { name string - beforeRun func() - afterRun func() + valIndex int + beforeRun func(valIndex int, valAddr sdktypes.ValAddress) + afterRun func(valIndex int) }{ { - name: "self remove existing validator - status bonded", - beforeRun: func() { + name: "self remove existing validator - status bonded", + valIndex: 0, + beforeRun: func(_ int, valAddr sdktypes.ValAddress) { resVal, err := s.Network().GetStakingClient().Validator( s.Network().GetContext(), &stakingtypes.QueryValidatorRequest{ @@ -620,12 +617,27 @@ func (s *TestSuite) TestSelfRemoveValidator_ExistingValidator_StatusBonded() { }, ) require.NoError(s.T(), err) - - require.Equal(s.T(), resVal.Validator.Status, stakingtypes.Bonded) + require.Equal(s.T(), stakingtypes.Bonded, resVal.Validator.Status) require.Equal(s.T(), sdktypes.DefaultPowerReduction.ToLegacyDec(), resVal.Validator.DelegatorShares) require.NotZero(s.T(), resVal.Validator.Tokens) }, - afterRun: func() { + }, + { + name: "self remove existing validator - status jailed", + valIndex: 1, + beforeRun: func(valIndex int, valAddr sdktypes.ValAddress) { + valSet := s.Network().GetValidatorSet() + require.NoError( + s.T(), + s.Network().NextNBlocksWithValidatorFlags( + slashingtypes.DefaultSignedBlocksWindow, + utils.NewValidatorFlags( + len(valSet.Validators), + utils.NewValidatorFlagOverride(valIndex, cmtproto.BlockIDFlagAbsent), + ), + ), + ) + resVal, err := s.Network().GetStakingClient().Validator( s.Network().GetContext(), &stakingtypes.QueryValidatorRequest{ @@ -633,49 +645,216 @@ func (s *TestSuite) TestSelfRemoveValidator_ExistingValidator_StatusBonded() { }, ) require.NoError(s.T(), err) + require.True(s.T(), resVal.Validator.Jailed) + require.Equal(s.T(), stakingtypes.Unbonding, resVal.Validator.Status) + }, + }, + { + name: "self remove existing validator - status tombstoned", + valIndex: 1, + beforeRun: func(valIndex int, _ sdktypes.ValAddress) { + valSet := s.Network().GetValidatorSet() + cmtValAddr := sdktypes.AccAddress(valSet.Validators[valIndex].Address.Bytes()) - require.True(s.T(), - resVal.Validator.DelegatorShares.IsZero(), - "delegator shares should be zero, got %s", - resVal.Validator.DelegatorShares, - ) - require.True(s.T(), resVal.Validator.Tokens.IsZero()) - require.Equal(s.T(), resVal.Validator.Status, stakingtypes.Unbonding) - - require.NoError(s.T(), s.Network().NextBlockAfter(stakingtypes.DefaultUnbondingTime)) + require.NoError(s.T(), s.Network().NextBlockWithMisBehaviors( + []abcitypes.Misbehavior{ + { + Type: abcitypes.MisbehaviorType_DUPLICATE_VOTE, + Validator: abcitypes.Validator{ + Address: cmtValAddr, + }, + Height: s.Network().GetContext().BlockHeight(), + TotalVotingPower: s.Network().GetValidatorSet().TotalVotingPower(), + }, + }, + )) - _, err = s.Network().GetStakingClient().Validator( + cmtValConsAddr := sdktypes.ConsAddress(valSet.Validators[valIndex].Address.Bytes()) + info, err := s.Network().GetSlashingClient().SigningInfo( s.Network().GetContext(), - &stakingtypes.QueryValidatorRequest{ - ValidatorAddr: valAddr.String(), + &slashingtypes.QuerySigningInfoRequest{ + ConsAddress: cmtValConsAddr.String(), }, ) - require.Contains(s.T(), err.Error(), fmt.Sprintf("validator %s not found", valAddr.String())) + require.NoError(s.T(), err) + require.True(s.T(), info.ValSigningInfo.Tombstoned) + }, + afterRun: func(valIndex int) { + valSet := s.Network().GetValidatorSet() + cmtValConsAddr := sdktypes.ConsAddress(valSet.Validators[valIndex].Address.Bytes()) + info, err := s.Network().GetSlashingClient().SigningInfo( + s.Network().GetContext(), + &slashingtypes.QuerySigningInfoRequest{ + ConsAddress: cmtValConsAddr.String(), + }, + ) + require.NoError(s.T(), err) + require.True(s.T(), info.ValSigningInfo.Tombstoned) }, }, } for _, tc := range tt { s.Run(tc.name, func() { + s.SetupTest() + + validators := s.Network().GetValidators() + require.NotZero(s.T(), len(validators)) + + validator := validators[tc.valIndex] + valAddr, err := sdktypes.ValAddressFromBech32(validator.OperatorAddress) + require.NoError(s.T(), err) + + valKey := s.keyring.GetKey(tc.valIndex) + require.Equal(s.T(), valAddr, sdktypes.ValAddress(valKey.AccAddr)) + if tc.beforeRun != nil { - tc.beforeRun() + tc.beforeRun(tc.valIndex, valAddr) } msg := poatypes.NewMsgSelfRemoveValidator(valKey.AccAddr.String()) - res, err := s.factory.CommitCosmosTx(valKey.Priv, factory.CosmosTxArgs{ Msgs: []sdktypes.Msg{msg}, }) require.NoError(s.T(), err) require.Equal(s.T(), uint32(0), res.Code, res.Log) + resVal, err := s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.NoError(s.T(), err) + require.True(s.T(), resVal.Validator.DelegatorShares.IsZero()) + require.True(s.T(), resVal.Validator.Tokens.IsZero()) + require.Equal(s.T(), stakingtypes.Unbonding, resVal.Validator.Status) + + require.NoError(s.T(), s.Network().NextBlockAfter(stakingtypes.DefaultUnbondingTime)) + + _, err = s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.Contains(s.T(), err.Error(), fmt.Sprintf("validator %s not found", valAddr.String())) + if tc.afterRun != nil { - tc.afterRun() + tc.afterRun(tc.valIndex) } }) } } +func (s *TestSuite) TestSelfRemoveValidator_UnexistingValidator() { + funder := s.keyring.GetKey(0) + nonValidator := keyring.NewKey() + + fundAmount := sdktypes.NewCoins(sdktypes.NewCoin(s.Network().GetBaseDenom(), sdkmath.NewInt(1_000_000_000_000_000_000))) + sendRes, err := s.factory.CommitCosmosTx(funder.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{banktypes.NewMsgSend(funder.AccAddr, nonValidator.AccAddr, fundAmount)}, + }) + require.NoError(s.T(), err) + require.Equal(s.T(), uint32(0), sendRes.Code, sendRes.Log) + + nonValAddr := sdktypes.ValAddress(nonValidator.AccAddr) + + _, err = s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: nonValAddr.String(), + }, + ) + require.Contains(s.T(), err.Error(), fmt.Sprintf("validator %s not found", nonValAddr.String())) + + gas := uint64(1_000_000) + msg := poatypes.NewMsgSelfRemoveValidator(nonValidator.AccAddr.String()) + res, err := s.factory.CommitCosmosTx(nonValidator.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{msg}, + Gas: &gas, + }) + require.NoError(s.T(), err) + require.NotEqual(s.T(), uint32(0), res.Code) + require.Contains(s.T(), res.Log, poatypes.ErrAddressIsNotAValidator.Error()) +} + +func (s *TestSuite) TestSelfRemoveValidator_DifferentSigner() { + signer := s.keyring.GetKey(0) + target := s.keyring.GetKey(1) + targetValAddr := sdktypes.ValAddress(target.AccAddr) + + gas := uint64(1_000_000) + msg := poatypes.NewMsgSelfRemoveValidator(target.AccAddr.String()) + res, err := s.factory.CommitCosmosTx(signer.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{msg}, + Gas: &gas, + }) + require.NoError(s.T(), err) + require.NotEqual(s.T(), uint32(0), res.Code) + require.Contains(s.T(), res.Log, sdkerrors.ErrUnauthorized.Error()) + + resVal, err := s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: targetValAddr.String(), + }, + ) + require.NoError(s.T(), err) + require.Equal(s.T(), stakingtypes.Bonded, resVal.Validator.Status) + require.False(s.T(), resVal.Validator.Tokens.IsZero()) +} + +func (s *TestSuite) TestSelfRemoveValidator_AlreadyRemoved() { + validators := s.Network().GetValidators() + require.NotZero(s.T(), len(validators)) + + valIndex := 0 + validator := validators[valIndex] + valAddr, err := sdktypes.ValAddressFromBech32(validator.OperatorAddress) + require.NoError(s.T(), err) + + valKey := s.keyring.GetKey(valIndex) + require.Equal(s.T(), valAddr, sdktypes.ValAddress(valKey.AccAddr)) + + msg := poatypes.NewMsgSelfRemoveValidator(valKey.AccAddr.String()) + + res, err := s.factory.CommitCosmosTx(valKey.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{msg}, + }) + require.NoError(s.T(), err) + require.Equal(s.T(), uint32(0), res.Code, res.Log) + + resVal, err := s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.NoError(s.T(), err) + require.Equal(s.T(), stakingtypes.Unbonding, resVal.Validator.Status) + require.True(s.T(), resVal.Validator.Tokens.IsZero()) + + gas := uint64(1_000_000) + res, err = s.factory.CommitCosmosTx(valKey.Priv, factory.CosmosTxArgs{ + Msgs: []sdktypes.Msg{msg}, + Gas: &gas, + }) + require.NoError(s.T(), err) + require.NotEqual(s.T(), uint32(0), res.Code) + require.Contains(s.T(), res.Log, stakingtypes.ErrNoDelegatorForAddress.Error()) + + resVal, err = s.Network().GetStakingClient().Validator( + s.Network().GetContext(), + &stakingtypes.QueryValidatorRequest{ + ValidatorAddr: valAddr.String(), + }, + ) + require.NoError(s.T(), err) + require.Equal(s.T(), stakingtypes.Unbonding, resVal.Validator.Status) + require.True(s.T(), resVal.Validator.Tokens.IsZero()) +} + // RemoveValidator tests func (s *TestSuite) TestRemoveValidator_UnexistingValidator() { From 2feeba86121cae2a816a1dd285f9a6389b18a684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lvaro=20Luque?= Date: Tue, 23 Jun 2026 08:14:23 +0200 Subject: [PATCH 6/6] fix(poa): align self-remove + add-validator test with main's address/unbonding refactor --- x/poa/keeper/keeper.go | 2 +- x/poa/keeper/msg_server_add_validator_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/x/poa/keeper/keeper.go b/x/poa/keeper/keeper.go index c03d6395..2934e41f 100644 --- a/x/poa/keeper/keeper.go +++ b/x/poa/keeper/keeper.go @@ -303,7 +303,7 @@ func (k Keeper) ExecuteSelfRemoveValidator(ctx sdk.Context, validatorAddress str return types.ErrAddressIsNotAValidator } - err = k.ExecuteRemoveValidator(ctx, valAddress.String()) + err = k.ExecuteRemoveValidator(ctx, accAddress.String()) if err != nil { return err } diff --git a/x/poa/keeper/msg_server_add_validator_test.go b/x/poa/keeper/msg_server_add_validator_test.go index c9e9ad38..eaf782d5 100644 --- a/x/poa/keeper/msg_server_add_validator_test.go +++ b/x/poa/keeper/msg_server_add_validator_test.go @@ -56,7 +56,7 @@ func TestMsgServer_AddValidator(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{