From ace4f5a23856db8ec0a5f2a0830bb5d11ba9083e Mon Sep 17 00:00:00 2001 From: p0p3yee Date: Thu, 21 Mar 2024 09:32:07 -0400 Subject: [PATCH 1/2] Add deregister msg & tests --- go.mod | 1 + go.sum | 2 + proto/fairyring/keyshare/tx.proto | 9 + scripts/tests/keyshare.sh | 39 ++ x/keyshare/client/cli/tx.go | 1 + .../client/cli/tx_deregister_validator.go | 38 ++ .../keeper/msg_server_deregister_validator.go | 34 ++ x/keyshare/types/codec.go | 5 +- x/keyshare/types/errors.go | 1 + x/keyshare/types/keys.go | 6 +- .../types/message_deregister_validator.go | 46 ++ x/keyshare/types/tx.pb.go | 500 +++++++++++++++--- 12 files changed, 619 insertions(+), 63 deletions(-) create mode 100644 x/keyshare/client/cli/tx_deregister_validator.go create mode 100644 x/keyshare/keeper/msg_server_deregister_validator.go create mode 100644 x/keyshare/types/message_deregister_validator.go diff --git a/go.mod b/go.mod index 127fde93..a8554e2a 100644 --- a/go.mod +++ b/go.mod @@ -179,6 +179,7 @@ require ( github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect + github.com/regen-network/cosmos-proto v0.3.1 // indirect github.com/rogpeppe/go-internal v1.11.0 // indirect github.com/rs/cors v1.9.0 // indirect github.com/rs/zerolog v1.30.0 // indirect diff --git a/go.sum b/go.sum index 524ccdbd..b3000e4f 100644 --- a/go.sum +++ b/go.sum @@ -1335,6 +1335,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= +github.com/regen-network/cosmos-proto v0.3.1 h1:rV7iM4SSFAagvy8RiyhiACbWEGotmqzywPxOvwMdxcg= +github.com/regen-network/cosmos-proto v0.3.1/go.mod h1:jO0sVX6a1B36nmE8C9xBFXpNwWejXC7QqCOnH3O0+YM= github.com/regen-network/protobuf v1.3.3-alpha.regen.1 h1:OHEc+q5iIAXpqiqFKeLpu5NwTIkVXUs48vFMwzqpqY4= github.com/regen-network/protobuf v1.3.3-alpha.regen.1/go.mod h1:2DjTFR1HhMQhiWC5sZ4OhQ3+NtdbZ6oBDKQwq5Ou+FI= github.com/remyoudompheng/go-dbus v0.0.0-20121104212943-b7232d34b1d5/go.mod h1:+u151txRmLpwxBmpYn9z3d1sdJdjRPQpsXuYeY9jNls= diff --git a/proto/fairyring/keyshare/tx.proto b/proto/fairyring/keyshare/tx.proto index 18a648e9..f9940058 100644 --- a/proto/fairyring/keyshare/tx.proto +++ b/proto/fairyring/keyshare/tx.proto @@ -11,6 +11,7 @@ option go_package = "github.com/Fairblock/fairyring/x/keyshare/types"; // Msg defines the Msg service. service Msg { rpc RegisterValidator (MsgRegisterValidator) returns (MsgRegisterValidatorResponse); + rpc DeRegisterValidator (MsgDeRegisterValidator) returns (MsgDeRegisterValidatorResponse); rpc SendKeyshare (MsgSendKeyshare ) returns (MsgSendKeyshareResponse ); // this line is used by starport scaffolding # proto/tx/rpc @@ -28,6 +29,14 @@ message MsgRegisterValidatorResponse { string creator = 1; } +message MsgDeRegisterValidator { + string creator = 1; +} + +message MsgDeRegisterValidatorResponse { + string creator = 1; +} + message MsgSendKeyshare { string creator = 1; string message = 2; diff --git a/scripts/tests/keyshare.sh b/scripts/tests/keyshare.sh index f395f047..836ba67d 100755 --- a/scripts/tests/keyshare.sh +++ b/scripts/tests/keyshare.sh @@ -37,6 +37,17 @@ wait_for_tx () { echo "$RESULT" } +echo "Non Validator deregistering validator on chain fairyring_test_1" +RESULT=$($BINARY tx keyshare deregister-validator --from $VALIDATOR_1 --gas-prices 1ufairy --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 --broadcast-mode sync --keyring-backend test -o json -y) +check_tx_code $RESULT +RESULT=$(wait_for_tx $RESULT) +ERROR_MSG=$(echo "$RESULT" | jq -r '.raw_log') +if [[ "$ERROR_MSG" != *"validator not registered"* ]]; then + echo "ERROR: KeyShare module deregister validator error. Expected to get validator not registered error, got '$ERROR_MSG'" + echo "ERROR MESSAGE: $(echo "$RESULT" | jq -r '.raw_log')" + exit 1 +fi + echo "Staked account registering as a validator on chain fairyring_test_1" RESULT=$($BINARY tx keyshare register-validator --from $VALIDATOR_1 --gas-prices 1ufairy --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 --broadcast-mode sync --keyring-backend test -o json -y) check_tx_code $RESULT @@ -48,6 +59,34 @@ if [ "$VALIDATOR_ADDR" != "$VALIDATOR_1" ]; then exit 1 fi +echo "Validator deregistering as a validator on chain fairyring_test_1" +RESULT=$($BINARY tx keyshare deregister-validator --from $VALIDATOR_1 --gas-prices 1ufairy --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 --broadcast-mode sync --keyring-backend test -o json -y) +check_tx_code $RESULT +RESULT=$(wait_for_tx $RESULT) +VALIDATOR_ADDR=$(echo "$RESULT" | jq -r '.logs[0].events[1].attributes[0].value') +if [ "$VALIDATOR_ADDR" != "$VALIDATOR_1" ]; then + echo "ERROR: KeyShare module deregister validator error. Expected deregistered validator address '$VALIDATOR_1', got '$VALIDATOR_ADDR'" + echo "ERROR MESSAGE: $(echo "$RESULT" | jq -r '.raw_log')" + exit 1 +fi + +RESULT=$($BINARY q keyshare list-validator-set --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 -o json) +CURRENT_SET_LEN=$(echo $RESULT | jq '.validatorSet | length') +if [ "$CURRENT_SET_LEN" != "0" ]; then + echo "ERROR: KeyShare module deregister validator error, Expected total validator set to be empty, got '$(echo $RESULT | jq '.validatorSet')'" + exit 1 +fi + +echo "Staked account registering as a validator on chain fairyring_test_1" +RESULT=$($BINARY tx keyshare register-validator --from $VALIDATOR_1 --gas-prices 1ufairy --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 --broadcast-mode sync --keyring-backend test -o json -y) +check_tx_code $RESULT +RESULT=$(wait_for_tx $RESULT) +VALIDATOR_ADDR=$(echo "$RESULT" | jq -r '.logs[0].events[1].attributes[0].value') +if [ "$VALIDATOR_ADDR" != "$VALIDATOR_1" ]; then + echo "ERROR: KeyShare module register validator error. Expected registered validator address '$VALIDATOR_1', got '$VALIDATOR_ADDR'" + echo "ERROR MESSAGE: $(echo "$RESULT" | jq -r '.raw_log')" + exit 1 +fi echo "Non staking account registering as a validator on chain fairyring_test_1" RESULT=$($BINARY tx keyshare register-validator --from $WALLET_1 --gas-prices 1ufairy --home $CHAIN_DIR/$CHAINID_1 --chain-id $CHAINID_1 --node tcp://localhost:16657 --broadcast-mode sync --keyring-backend test -o json -y) diff --git a/x/keyshare/client/cli/tx.go b/x/keyshare/client/cli/tx.go index 0817e9a1..0138f877 100644 --- a/x/keyshare/client/cli/tx.go +++ b/x/keyshare/client/cli/tx.go @@ -26,6 +26,7 @@ func GetTxCmd() *cobra.Command { } cmd.AddCommand(CmdRegisterValidator()) + cmd.AddCommand(CmdDeRegisterValidator()) cmd.AddCommand(CmdSendKeyshare()) cmd.AddCommand(CmdCreateLatestPubKey()) cmd.AddCommand(CmdCreateAuthorizedAddress()) diff --git a/x/keyshare/client/cli/tx_deregister_validator.go b/x/keyshare/client/cli/tx_deregister_validator.go new file mode 100644 index 00000000..40a9bada --- /dev/null +++ b/x/keyshare/client/cli/tx_deregister_validator.go @@ -0,0 +1,38 @@ +package cli + +import ( + "strconv" + + "github.com/Fairblock/fairyring/x/keyshare/types" + + "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/client/tx" + "github.com/spf13/cobra" +) + +var _ = strconv.Itoa(0) + +func CmdDeRegisterValidator() *cobra.Command { + cmd := &cobra.Command{ + Use: "deregister-validator", + Short: "Deregister a validator for being eligible to send keyshares", + Args: cobra.ExactArgs(0), + RunE: func(cmd *cobra.Command, args []string) (err error) { + + clientCtx, err := client.GetClientTxContext(cmd) + if err != nil { + return err + } + + msg := types.NewMsgDeRegisterValidator( + clientCtx.GetFromAddress().String(), + ) + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + }, + } + + flags.AddTxFlagsToCmd(cmd) + + return cmd +} diff --git a/x/keyshare/keeper/msg_server_deregister_validator.go b/x/keyshare/keeper/msg_server_deregister_validator.go new file mode 100644 index 00000000..a1daabef --- /dev/null +++ b/x/keyshare/keeper/msg_server_deregister_validator.go @@ -0,0 +1,34 @@ +package keeper + +import ( + "context" + "github.com/Fairblock/fairyring/x/keyshare/types" + sdk "github.com/cosmos/cosmos-sdk/types" +) + +// DeRegisterValidator remove a validator in the validator set +func (k msgServer) DeRegisterValidator(goCtx context.Context, msg *types.MsgDeRegisterValidator) (*types.MsgDeRegisterValidatorResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + _, found := k.GetValidatorSet(ctx, msg.Creator) + + if !found { + return nil, types.ErrValidatorNotRegistered.Wrap(msg.Creator) + } + + if k.GetAuthorizedCount(ctx, msg.Creator) > 0 { + return nil, types.ErrAuthorizedAnotherAddr + } + + k.RemoveValidatorSet(ctx, msg.Creator) + + ctx.EventManager().EmitEvent( + sdk.NewEvent(types.DeRegisteredValidatorEventType, + sdk.NewAttribute(types.DeRegisteredValidatorEventCreator, msg.Creator), + ), + ) + + return &types.MsgDeRegisterValidatorResponse{ + Creator: msg.Creator, + }, nil +} diff --git a/x/keyshare/types/codec.go b/x/keyshare/types/codec.go index 0de9c1c0..0aba65b6 100644 --- a/x/keyshare/types/codec.go +++ b/x/keyshare/types/codec.go @@ -21,7 +21,7 @@ func RegisterCodec(cdc *codec.LegacyAmino) { cdc.RegisterConcrete(&MsgUpdateAuthorizedAddress{}, "keyshare/UpdateAuthorizedAddress", nil) cdc.RegisterConcrete(&MsgDeleteAuthorizedAddress{}, "keyshare/DeleteAuthorizedAddress", nil) cdc.RegisterConcrete(&MsgCreateGeneralKeyShare{}, "keyshare/CreateGeneralKeyShare", nil) - + cdc.RegisterConcrete(&MsgDeRegisterValidator{}, "keyshare/DeRegisterValidator", nil) // this line is used by starport scaffolding # 2 } @@ -43,6 +43,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations((*sdk.Msg)(nil), &MsgCreateGeneralKeyShare{}, ) + registry.RegisterImplementations((*sdk.Msg)(nil), + &MsgDeRegisterValidator{}, + ) // this line is used by starport scaffolding # 3 msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/keyshare/types/errors.go b/x/keyshare/types/errors.go index e67313c9..c1468718 100644 --- a/x/keyshare/types/errors.go +++ b/x/keyshare/types/errors.go @@ -33,6 +33,7 @@ var ( ErrInvalidVersion = sdkerrors.Register(ModuleName, 1123, "invalid version") ErrRequestNotFound = sdkerrors.Register(ModuleName, 1124, "no request found with this identity") ErrInvalidNumberOfValidators = sdkerrors.Register(ModuleName, 1125, "invalid number of validators") + ErrAuthorizedAnotherAddr = sdkerrors.Register(ModuleName, 1126, "validator authorized another address, please remove authorized address before deregistering") ErrAddressAlreadyAuthorized = sdkerrors.Register(ModuleName, 1900, "address is already authorized") ErrAuthorizedAddrNotFound = sdkerrors.Register(ModuleName, 1901, "target authorized address not found") ErrNotAuthorizedAddrCreator = sdkerrors.Register(ModuleName, 1902, "sender is not the creator of target authorized address") diff --git a/x/keyshare/types/keys.go b/x/keyshare/types/keys.go index 2b759631..e5ff7f18 100644 --- a/x/keyshare/types/keys.go +++ b/x/keyshare/types/keys.go @@ -24,7 +24,6 @@ const ( ) const ( - KeyAggregationThresholdPercentage = 2.0 / 3.0 KeyAggregationThresholdNumerator = 2 KeyAggregationThresholdDenominator = 3 ) @@ -38,6 +37,11 @@ const ( RegisteredValidatorEventCreator = "creator" ) +const ( + DeRegisteredValidatorEventType = "validator-deregistered" + DeRegisteredValidatorEventCreator = "creator" +) + const ( SendKeyshareEventType = "keyshare-sent" SendKeyshareEventValidator = "validator" diff --git a/x/keyshare/types/message_deregister_validator.go b/x/keyshare/types/message_deregister_validator.go new file mode 100644 index 00000000..b3392a12 --- /dev/null +++ b/x/keyshare/types/message_deregister_validator.go @@ -0,0 +1,46 @@ +package types + +import ( + sdkerrors "cosmossdk.io/errors" + sdk "github.com/cosmos/cosmos-sdk/types" + cosmoserror "github.com/cosmos/cosmos-sdk/types/errors" +) + +const TypeMsgDeRegisterValidator = "deregister_validator" + +var _ sdk.Msg = &MsgRegisterValidator{} + +func NewMsgDeRegisterValidator(creator string) *MsgDeRegisterValidator { + return &MsgDeRegisterValidator{ + Creator: creator, + } +} + +func (msg *MsgDeRegisterValidator) Route() string { + return RouterKey +} + +func (msg *MsgDeRegisterValidator) Type() string { + return TypeMsgDeRegisterValidator +} + +func (msg *MsgDeRegisterValidator) GetSigners() []sdk.AccAddress { + creator, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + panic(err) + } + return []sdk.AccAddress{creator} +} + +func (msg *MsgDeRegisterValidator) GetSignBytes() []byte { + bz := ModuleCdc.MustMarshalJSON(msg) + return sdk.MustSortJSON(bz) +} + +func (msg *MsgDeRegisterValidator) ValidateBasic() error { + _, err := sdk.AccAddressFromBech32(msg.Creator) + if err != nil { + return sdkerrors.Wrapf(cosmoserror.ErrInvalidAddress, "invalid creator address (%s)", err) + } + return nil +} diff --git a/x/keyshare/types/tx.pb.go b/x/keyshare/types/tx.pb.go index 7f0b0249..1b60c7f3 100644 --- a/x/keyshare/types/tx.pb.go +++ b/x/keyshare/types/tx.pb.go @@ -115,6 +115,94 @@ func (m *MsgRegisterValidatorResponse) GetCreator() string { return "" } +type MsgDeRegisterValidator struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` +} + +func (m *MsgDeRegisterValidator) Reset() { *m = MsgDeRegisterValidator{} } +func (m *MsgDeRegisterValidator) String() string { return proto.CompactTextString(m) } +func (*MsgDeRegisterValidator) ProtoMessage() {} +func (*MsgDeRegisterValidator) Descriptor() ([]byte, []int) { + return fileDescriptor_1f96ac6a55f1845c, []int{2} +} +func (m *MsgDeRegisterValidator) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDeRegisterValidator) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDeRegisterValidator.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 *MsgDeRegisterValidator) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeRegisterValidator.Merge(m, src) +} +func (m *MsgDeRegisterValidator) XXX_Size() int { + return m.Size() +} +func (m *MsgDeRegisterValidator) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeRegisterValidator.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDeRegisterValidator proto.InternalMessageInfo + +func (m *MsgDeRegisterValidator) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + +type MsgDeRegisterValidatorResponse struct { + Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` +} + +func (m *MsgDeRegisterValidatorResponse) Reset() { *m = MsgDeRegisterValidatorResponse{} } +func (m *MsgDeRegisterValidatorResponse) String() string { return proto.CompactTextString(m) } +func (*MsgDeRegisterValidatorResponse) ProtoMessage() {} +func (*MsgDeRegisterValidatorResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_1f96ac6a55f1845c, []int{3} +} +func (m *MsgDeRegisterValidatorResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgDeRegisterValidatorResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgDeRegisterValidatorResponse.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 *MsgDeRegisterValidatorResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgDeRegisterValidatorResponse.Merge(m, src) +} +func (m *MsgDeRegisterValidatorResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgDeRegisterValidatorResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgDeRegisterValidatorResponse.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgDeRegisterValidatorResponse proto.InternalMessageInfo + +func (m *MsgDeRegisterValidatorResponse) GetCreator() string { + if m != nil { + return m.Creator + } + return "" +} + type MsgSendKeyshare struct { Creator string `protobuf:"bytes,1,opt,name=creator,proto3" json:"creator,omitempty"` Message string `protobuf:"bytes,2,opt,name=message,proto3" json:"message,omitempty"` @@ -126,7 +214,7 @@ func (m *MsgSendKeyshare) Reset() { *m = MsgSendKeyshare{} } func (m *MsgSendKeyshare) String() string { return proto.CompactTextString(m) } func (*MsgSendKeyshare) ProtoMessage() {} func (*MsgSendKeyshare) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{2} + return fileDescriptor_1f96ac6a55f1845c, []int{4} } func (m *MsgSendKeyshare) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -197,7 +285,7 @@ func (m *MsgSendKeyshareResponse) Reset() { *m = MsgSendKeyshareResponse func (m *MsgSendKeyshareResponse) String() string { return proto.CompactTextString(m) } func (*MsgSendKeyshareResponse) ProtoMessage() {} func (*MsgSendKeyshareResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{3} + return fileDescriptor_1f96ac6a55f1845c, []int{5} } func (m *MsgSendKeyshareResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -287,7 +375,7 @@ func (m *MsgCreateLatestPubKey) Reset() { *m = MsgCreateLatestPubKey{} } func (m *MsgCreateLatestPubKey) String() string { return proto.CompactTextString(m) } func (*MsgCreateLatestPubKey) ProtoMessage() {} func (*MsgCreateLatestPubKey) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{4} + return fileDescriptor_1f96ac6a55f1845c, []int{6} } func (m *MsgCreateLatestPubKey) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -351,7 +439,7 @@ func (m *MsgCreateLatestPubKeyResponse) Reset() { *m = MsgCreateLatestPu func (m *MsgCreateLatestPubKeyResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateLatestPubKeyResponse) ProtoMessage() {} func (*MsgCreateLatestPubKeyResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{5} + return fileDescriptor_1f96ac6a55f1845c, []int{7} } func (m *MsgCreateLatestPubKeyResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -389,7 +477,7 @@ func (m *MsgCreateAuthorizedAddress) Reset() { *m = MsgCreateAuthorizedA func (m *MsgCreateAuthorizedAddress) String() string { return proto.CompactTextString(m) } func (*MsgCreateAuthorizedAddress) ProtoMessage() {} func (*MsgCreateAuthorizedAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{6} + return fileDescriptor_1f96ac6a55f1845c, []int{8} } func (m *MsgCreateAuthorizedAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -439,7 +527,7 @@ func (m *MsgCreateAuthorizedAddressResponse) Reset() { *m = MsgCreateAut func (m *MsgCreateAuthorizedAddressResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateAuthorizedAddressResponse) ProtoMessage() {} func (*MsgCreateAuthorizedAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{7} + return fileDescriptor_1f96ac6a55f1845c, []int{9} } func (m *MsgCreateAuthorizedAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -478,7 +566,7 @@ func (m *MsgUpdateAuthorizedAddress) Reset() { *m = MsgUpdateAuthorizedA func (m *MsgUpdateAuthorizedAddress) String() string { return proto.CompactTextString(m) } func (*MsgUpdateAuthorizedAddress) ProtoMessage() {} func (*MsgUpdateAuthorizedAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{8} + return fileDescriptor_1f96ac6a55f1845c, []int{10} } func (m *MsgUpdateAuthorizedAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -535,7 +623,7 @@ func (m *MsgUpdateAuthorizedAddressResponse) Reset() { *m = MsgUpdateAut func (m *MsgUpdateAuthorizedAddressResponse) String() string { return proto.CompactTextString(m) } func (*MsgUpdateAuthorizedAddressResponse) ProtoMessage() {} func (*MsgUpdateAuthorizedAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{9} + return fileDescriptor_1f96ac6a55f1845c, []int{11} } func (m *MsgUpdateAuthorizedAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -573,7 +661,7 @@ func (m *MsgDeleteAuthorizedAddress) Reset() { *m = MsgDeleteAuthorizedA func (m *MsgDeleteAuthorizedAddress) String() string { return proto.CompactTextString(m) } func (*MsgDeleteAuthorizedAddress) ProtoMessage() {} func (*MsgDeleteAuthorizedAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{10} + return fileDescriptor_1f96ac6a55f1845c, []int{12} } func (m *MsgDeleteAuthorizedAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -623,7 +711,7 @@ func (m *MsgDeleteAuthorizedAddressResponse) Reset() { *m = MsgDeleteAut func (m *MsgDeleteAuthorizedAddressResponse) String() string { return proto.CompactTextString(m) } func (*MsgDeleteAuthorizedAddressResponse) ProtoMessage() {} func (*MsgDeleteAuthorizedAddressResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{11} + return fileDescriptor_1f96ac6a55f1845c, []int{13} } func (m *MsgDeleteAuthorizedAddressResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -666,7 +754,7 @@ func (m *MsgCreateGeneralKeyShare) Reset() { *m = MsgCreateGeneralKeySha func (m *MsgCreateGeneralKeyShare) String() string { return proto.CompactTextString(m) } func (*MsgCreateGeneralKeyShare) ProtoMessage() {} func (*MsgCreateGeneralKeyShare) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{12} + return fileDescriptor_1f96ac6a55f1845c, []int{14} } func (m *MsgCreateGeneralKeyShare) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -759,7 +847,7 @@ func (m *MsgCreateGeneralKeyShareResponse) Reset() { *m = MsgCreateGener func (m *MsgCreateGeneralKeyShareResponse) String() string { return proto.CompactTextString(m) } func (*MsgCreateGeneralKeyShareResponse) ProtoMessage() {} func (*MsgCreateGeneralKeyShareResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_1f96ac6a55f1845c, []int{13} + return fileDescriptor_1f96ac6a55f1845c, []int{15} } func (m *MsgCreateGeneralKeyShareResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -847,6 +935,8 @@ func (m *MsgCreateGeneralKeyShareResponse) GetErrorMessage() string { func init() { proto.RegisterType((*MsgRegisterValidator)(nil), "fairyring.keyshare.MsgRegisterValidator") proto.RegisterType((*MsgRegisterValidatorResponse)(nil), "fairyring.keyshare.MsgRegisterValidatorResponse") + proto.RegisterType((*MsgDeRegisterValidator)(nil), "fairyring.keyshare.MsgDeRegisterValidator") + proto.RegisterType((*MsgDeRegisterValidatorResponse)(nil), "fairyring.keyshare.MsgDeRegisterValidatorResponse") proto.RegisterType((*MsgSendKeyshare)(nil), "fairyring.keyshare.MsgSendKeyshare") proto.RegisterType((*MsgSendKeyshareResponse)(nil), "fairyring.keyshare.MsgSendKeyshareResponse") proto.RegisterType((*MsgCreateLatestPubKey)(nil), "fairyring.keyshare.MsgCreateLatestPubKey") @@ -864,55 +954,57 @@ func init() { func init() { proto.RegisterFile("fairyring/keyshare/tx.proto", fileDescriptor_1f96ac6a55f1845c) } var fileDescriptor_1f96ac6a55f1845c = []byte{ - // 755 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0x4d, 0x6f, 0xd3, 0x4a, - 0x14, 0xad, 0x93, 0x36, 0x49, 0xef, 0xeb, 0xd3, 0x53, 0xfd, 0x5e, 0x5b, 0xcb, 0xaf, 0x84, 0xc8, - 0x74, 0x11, 0xa0, 0x4a, 0xca, 0x87, 0x10, 0xdb, 0x16, 0x04, 0x54, 0x21, 0x80, 0xdc, 0xd2, 0x05, - 0x9b, 0xe2, 0xd8, 0xb7, 0xce, 0x28, 0x71, 0x6c, 0xcd, 0x8c, 0x51, 0x0d, 0x2b, 0x56, 0xb0, 0x41, - 0xe2, 0x27, 0xc0, 0xbf, 0x61, 0xd9, 0x0d, 0x12, 0x4b, 0xd4, 0xfe, 0x11, 0x64, 0xc7, 0x76, 0x9d, - 0xc6, 0x93, 0x26, 0x12, 0x12, 0xbb, 0xdc, 0x7b, 0xcf, 0xcc, 0x3d, 0x73, 0xe2, 0x7b, 0x66, 0xe0, - 0xff, 0x23, 0x83, 0xd0, 0x80, 0x92, 0x81, 0xdd, 0xec, 0x61, 0xc0, 0xba, 0x06, 0xc5, 0x26, 0x3f, - 0x6e, 0x78, 0xd4, 0xe5, 0xae, 0x2c, 0xa7, 0xc5, 0x46, 0x52, 0x54, 0x6f, 0xe4, 0x2c, 0xb0, 0x71, - 0x80, 0xd4, 0xe8, 0x1f, 0xf6, 0x30, 0x38, 0x8c, 0x32, 0xc3, 0xf5, 0xda, 0x16, 0xfc, 0xd7, 0x66, - 0xb6, 0x8e, 0x36, 0x61, 0x1c, 0xe9, 0x81, 0xd1, 0x27, 0x96, 0xc1, 0x5d, 0x2a, 0x2b, 0x50, 0x36, - 0x29, 0x86, 0x3f, 0x15, 0xa9, 0x26, 0xd5, 0x17, 0xf5, 0x24, 0xd4, 0xee, 0xc3, 0x7a, 0xde, 0x0a, - 0x1d, 0x99, 0xe7, 0x0e, 0x18, 0x4e, 0x58, 0xf9, 0x49, 0x82, 0x7f, 0xda, 0xcc, 0xde, 0xc3, 0x81, - 0xd5, 0x8a, 0x79, 0x89, 0xd1, 0x61, 0xc5, 0x41, 0xc6, 0x0c, 0x1b, 0x95, 0xc2, 0xb0, 0x12, 0x87, - 0xf2, 0x06, 0xfc, 0xdd, 0xc3, 0x60, 0x2f, 0x5c, 0xbf, 0x3b, 0xb0, 0xf0, 0x58, 0x29, 0xd6, 0xa4, - 0xfa, 0xbc, 0x3e, 0x9a, 0x94, 0x6b, 0xf0, 0x57, 0xa7, 0xef, 0x9a, 0xbd, 0x27, 0x48, 0xec, 0x2e, - 0x57, 0xe6, 0x23, 0x4c, 0x36, 0xa5, 0x7d, 0x28, 0xc0, 0xda, 0x05, 0x3e, 0x97, 0x9f, 0x42, 0x56, - 0xa1, 0x92, 0xa8, 0x1a, 0x13, 0x4b, 0xe3, 0x98, 0x19, 0xcb, 0x63, 0xc6, 0x66, 0x60, 0x26, 0x6f, - 0xc1, 0xbf, 0x14, 0x4d, 0x24, 0x6f, 0xd0, 0xda, 0xc9, 0x20, 0x17, 0x22, 0x64, 0x5e, 0x29, 0xe4, - 0xcb, 0x7c, 0xd3, 0x44, 0xc6, 0x94, 0x52, 0x4d, 0xaa, 0x57, 0xf4, 0x24, 0x94, 0x35, 0x58, 0x42, - 0x4a, 0x5d, 0xda, 0x8e, 0xc5, 0x2c, 0x47, 0x9c, 0x47, 0x72, 0xda, 0x57, 0x09, 0x56, 0xda, 0xcc, - 0x7e, 0x10, 0x1e, 0x11, 0x9f, 0x1a, 0x1c, 0x19, 0x7f, 0xe1, 0x77, 0x5a, 0x18, 0x4c, 0xd0, 0x61, - 0x1d, 0x16, 0x3d, 0xbf, 0xd3, 0x27, 0x66, 0x0b, 0x83, 0x58, 0x88, 0xf3, 0x44, 0x78, 0x46, 0xd3, - 0x75, 0x1c, 0xc2, 0x1d, 0x1c, 0x70, 0xa6, 0x14, 0x6b, 0xc5, 0xfa, 0xa2, 0x9e, 0x4d, 0xc9, 0x0d, - 0x90, 0x07, 0xbe, 0xd3, 0x41, 0xfa, 0xfc, 0x28, 0xfd, 0x88, 0x58, 0x2c, 0x46, 0x4e, 0x45, 0xbb, - 0x0a, 0x57, 0x72, 0x29, 0x26, 0x7f, 0x99, 0xf6, 0x0c, 0xd4, 0x14, 0xb0, 0xed, 0xf3, 0xae, 0x4b, - 0xc9, 0x5b, 0xb4, 0xb6, 0x2d, 0x8b, 0x86, 0x32, 0xac, 0x42, 0x89, 0x1b, 0xd4, 0x46, 0x1e, 0x9f, - 0x23, 0x8e, 0xb2, 0x07, 0x2c, 0x8c, 0x7e, 0xae, 0x1b, 0xa0, 0x89, 0xf7, 0x4b, 0xbb, 0xd2, 0xa8, - 0xeb, 0x4b, 0xcf, 0x9a, 0xa9, 0xab, 0x06, 0x4b, 0x84, 0x9d, 0xc3, 0xa3, 0xd6, 0x15, 0x7d, 0x24, - 0x97, 0x65, 0x56, 0xcc, 0x63, 0x26, 0xe8, 0x79, 0x41, 0x8f, 0x87, 0xd8, 0xc7, 0xdf, 0xa9, 0x87, - 0x60, 0xbf, 0xb4, 0xeb, 0xc7, 0x02, 0x28, 0xa9, 0x6c, 0x8f, 0x87, 0xae, 0xd3, 0x8a, 0x07, 0x73, - 0xc2, 0xd7, 0xb4, 0x0a, 0x25, 0x62, 0xed, 0x07, 0x5e, 0x32, 0x53, 0x71, 0x14, 0xae, 0x20, 0xd6, - 0x81, 0xd1, 0xf7, 0x31, 0x11, 0x21, 0x0e, 0xe3, 0x39, 0x8c, 0xf6, 0x8d, 0xbe, 0x9a, 0xe1, 0x1c, - 0xee, 0x65, 0xe6, 0x30, 0xe3, 0x10, 0x0b, 0x79, 0x0e, 0xb1, 0x09, 0xcb, 0xc9, 0x28, 0xed, 0x13, - 0x07, 0x19, 0x37, 0x1c, 0x2f, 0x9a, 0x9e, 0x79, 0x7d, 0xbc, 0x20, 0x9a, 0xc9, 0xb2, 0x70, 0x26, - 0xb5, 0x2f, 0x05, 0xa8, 0x89, 0xa4, 0x98, 0xc2, 0x68, 0xfe, 0x84, 0x24, 0x82, 0x43, 0x96, 0xa6, - 0x32, 0x9e, 0xf2, 0x64, 0xe3, 0xa9, 0x8c, 0x1b, 0xcf, 0xed, 0xef, 0x25, 0x28, 0xb6, 0x99, 0x2d, - 0xbb, 0xb0, 0x3c, 0x7e, 0x07, 0xd5, 0x1b, 0xe3, 0x97, 0x5b, 0x23, 0xef, 0xee, 0x51, 0xb7, 0xa6, - 0x45, 0xa6, 0xb2, 0xbf, 0x86, 0xa5, 0x91, 0x7b, 0xe8, 0x9a, 0x60, 0x87, 0x2c, 0x48, 0xbd, 0x39, - 0x05, 0x28, 0xed, 0x40, 0x41, 0xce, 0xf1, 0xd3, 0xeb, 0x82, 0x2d, 0xc6, 0xa1, 0xea, 0xad, 0xa9, - 0xa1, 0x69, 0xcf, 0xf7, 0x12, 0xac, 0x89, 0x0c, 0xb0, 0x31, 0x71, 0xbb, 0x31, 0xbc, 0x7a, 0x6f, - 0x36, 0xfc, 0x08, 0x07, 0x91, 0x1d, 0x8a, 0x38, 0x08, 0xf0, 0x42, 0x0e, 0x97, 0x58, 0x5f, 0xc4, - 0x41, 0x64, 0x7c, 0x22, 0x0e, 0x02, 0xbc, 0x90, 0xc3, 0x25, 0x46, 0x28, 0xbf, 0x83, 0x95, 0x7c, - 0x13, 0xdc, 0x9c, 0x28, 0xec, 0x05, 0xb4, 0x7a, 0x77, 0x16, 0x74, 0xd2, 0x7c, 0x67, 0xf7, 0xdb, - 0x69, 0x55, 0x3a, 0x39, 0xad, 0x4a, 0x3f, 0x4f, 0xab, 0xd2, 0xe7, 0xb3, 0xea, 0xdc, 0xc9, 0x59, - 0x75, 0xee, 0xc7, 0x59, 0x75, 0xee, 0x55, 0xd3, 0x26, 0xbc, 0xeb, 0x77, 0x1a, 0xa6, 0xeb, 0x34, - 0x1f, 0x19, 0x84, 0x46, 0xcf, 0x8e, 0xe6, 0xf9, 0x8b, 0xf1, 0x38, 0xf3, 0xc8, 0x0c, 0x3c, 0x64, - 0x9d, 0x52, 0xf4, 0x50, 0xbc, 0xf3, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x58, 0x42, 0x78, 0x99, 0x87, - 0x0a, 0x00, 0x00, + // 787 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xc1, 0x6e, 0xd3, 0x40, + 0x10, 0xad, 0x93, 0x36, 0x49, 0x87, 0x22, 0x54, 0x97, 0xb6, 0x96, 0x29, 0x21, 0x32, 0x3d, 0x84, + 0x52, 0x39, 0xa5, 0x20, 0x84, 0xb8, 0xb5, 0x54, 0x40, 0x15, 0x02, 0xc8, 0x2d, 0x3d, 0x70, 0x29, + 0x8e, 0x3d, 0x75, 0xac, 0xc4, 0x71, 0xb4, 0x6b, 0xa3, 0x1a, 0x4e, 0x9c, 0xe0, 0x82, 0xc4, 0x27, + 0xc0, 0xdf, 0x70, 0xe0, 0xd0, 0x23, 0x47, 0xd4, 0xfe, 0x08, 0xb2, 0x63, 0xbb, 0x4e, 0xb3, 0x9b, + 0x26, 0x12, 0x12, 0xb7, 0xec, 0xce, 0x9b, 0x99, 0xb7, 0x2f, 0x3b, 0x6f, 0x0d, 0x37, 0x8e, 0x74, + 0x9b, 0x04, 0xc4, 0xee, 0x5a, 0xb5, 0x36, 0x06, 0xb4, 0xa5, 0x13, 0xac, 0x79, 0xc7, 0x6a, 0x8f, + 0xb8, 0x9e, 0x2b, 0x8a, 0x69, 0x50, 0x4d, 0x82, 0xf2, 0x1a, 0x23, 0xc1, 0xc2, 0x2e, 0x12, 0xbd, + 0x73, 0xd8, 0xc6, 0xe0, 0x30, 0xda, 0xe9, 0xe7, 0x2b, 0x1b, 0x70, 0xbd, 0x41, 0x2d, 0x0d, 0x2d, + 0x9b, 0x7a, 0x48, 0x0e, 0xf4, 0x8e, 0x6d, 0xea, 0x9e, 0x4b, 0x44, 0x09, 0x8a, 0x06, 0xc1, 0xf0, + 0xa7, 0x24, 0x54, 0x84, 0xea, 0xac, 0x96, 0x2c, 0x95, 0x47, 0xb0, 0xc2, 0xca, 0xd0, 0x90, 0xf6, + 0xdc, 0x2e, 0xc5, 0x11, 0x99, 0x9b, 0xb0, 0xd4, 0xa0, 0xd6, 0x0e, 0x4e, 0xd2, 0xed, 0x31, 0x94, + 0xd9, 0x39, 0x63, 0xf4, 0xfb, 0x2a, 0xc0, 0xb5, 0x06, 0xb5, 0xf6, 0xb0, 0x6b, 0xd6, 0x63, 0x1d, + 0xf8, 0xe8, 0x30, 0xe2, 0x20, 0xa5, 0xba, 0x85, 0x52, 0xae, 0x1f, 0x89, 0x97, 0xe2, 0x2a, 0x5c, + 0x6d, 0x63, 0xb0, 0x17, 0xe6, 0xef, 0x76, 0x4d, 0x3c, 0x96, 0xf2, 0x15, 0xa1, 0x3a, 0xad, 0x0d, + 0x6e, 0x8a, 0x15, 0xb8, 0xd2, 0xec, 0xb8, 0x46, 0xfb, 0x39, 0xda, 0x56, 0xcb, 0x93, 0xa6, 0x23, + 0x4c, 0x76, 0x4b, 0xf9, 0x9c, 0x83, 0xe5, 0x0b, 0x7c, 0x2e, 0x3f, 0x85, 0x28, 0x43, 0x29, 0xf9, + 0x17, 0x63, 0x62, 0xe9, 0x3a, 0x66, 0x46, 0x59, 0xcc, 0xe8, 0x04, 0xcc, 0xc4, 0x0d, 0x58, 0x20, + 0x68, 0xa0, 0xfd, 0x1e, 0xcd, 0xed, 0x0c, 0x72, 0x26, 0x42, 0xb2, 0x42, 0x21, 0x5f, 0xea, 0x1b, + 0x06, 0x52, 0x2a, 0x15, 0x2a, 0x42, 0xb5, 0xa4, 0x25, 0x4b, 0x51, 0x81, 0x39, 0x24, 0xc4, 0x25, + 0x8d, 0x58, 0xcc, 0x62, 0xc4, 0x79, 0x60, 0x4f, 0xf9, 0x21, 0xc0, 0x62, 0x83, 0x5a, 0x4f, 0xc2, + 0x23, 0xe2, 0x0b, 0xdd, 0x43, 0xea, 0xbd, 0xf6, 0x9b, 0x75, 0x0c, 0x46, 0xe8, 0xb0, 0x02, 0xb3, + 0x3d, 0xbf, 0xd9, 0xb1, 0x8d, 0x3a, 0x06, 0xb1, 0x10, 0xe7, 0x1b, 0xe1, 0x19, 0x0d, 0xd7, 0x71, + 0x6c, 0xcf, 0xc1, 0xae, 0x47, 0xa5, 0x7c, 0x25, 0x5f, 0x9d, 0xd5, 0xb2, 0x5b, 0xa2, 0x0a, 0x62, + 0xd7, 0x77, 0x9a, 0x48, 0x5e, 0x1d, 0xa5, 0x97, 0x88, 0xc6, 0x62, 0x30, 0x22, 0xca, 0x2d, 0xb8, + 0xc9, 0xa4, 0x98, 0xfc, 0x65, 0xca, 0x4b, 0x90, 0x53, 0xc0, 0x96, 0xef, 0xb5, 0x5c, 0x62, 0x7f, + 0x40, 0x73, 0xcb, 0x34, 0x49, 0x28, 0xc3, 0x12, 0x14, 0x3c, 0x9d, 0x58, 0xe8, 0xc5, 0xe7, 0x88, + 0x57, 0xd9, 0x03, 0xe6, 0x06, 0xaf, 0xeb, 0x2a, 0x28, 0xfc, 0x7a, 0x69, 0x57, 0x12, 0x75, 0x7d, + 0xd3, 0x33, 0x27, 0xea, 0xaa, 0xc0, 0x9c, 0x4d, 0xcf, 0xe1, 0x51, 0xeb, 0x92, 0x36, 0xb0, 0x97, + 0x65, 0x96, 0x67, 0x31, 0xe3, 0xf4, 0xbc, 0xa0, 0xc7, 0x0e, 0x76, 0xf0, 0x5f, 0xea, 0xc1, 0xa9, + 0x97, 0x76, 0xfd, 0x92, 0x03, 0x29, 0x95, 0xed, 0x59, 0xdf, 0xe5, 0xea, 0xf1, 0x60, 0x8e, 0xb8, + 0x4d, 0x4b, 0x50, 0xb0, 0xcd, 0xfd, 0xa0, 0x97, 0xcc, 0x54, 0xbc, 0x0a, 0x33, 0x6c, 0xf3, 0x40, + 0xef, 0xf8, 0x98, 0x88, 0x10, 0x2f, 0xe3, 0x39, 0x8c, 0xea, 0x46, 0xb7, 0xa6, 0x3f, 0x87, 0x7b, + 0x99, 0x39, 0xcc, 0x38, 0xc4, 0x0c, 0xcb, 0x21, 0xd6, 0x61, 0x3e, 0x19, 0xa5, 0x7d, 0xdb, 0x41, + 0xea, 0xe9, 0x4e, 0x2f, 0x9a, 0x9e, 0x69, 0x6d, 0x38, 0xc0, 0x9b, 0xc9, 0x22, 0x77, 0x26, 0x95, + 0xef, 0x39, 0xa8, 0xf0, 0xa4, 0x18, 0xc3, 0x68, 0xfe, 0x87, 0x24, 0x9c, 0x43, 0x16, 0xc6, 0x32, + 0x9e, 0xe2, 0x68, 0xe3, 0x29, 0x0d, 0x1b, 0xcf, 0xe6, 0xaf, 0x22, 0xe4, 0x1b, 0xd4, 0x12, 0x5d, + 0x98, 0x1f, 0x7e, 0x85, 0xaa, 0xea, 0xf0, 0x63, 0xaa, 0xb2, 0xde, 0x3a, 0x79, 0x63, 0x5c, 0x64, + 0x2a, 0xbb, 0x0f, 0x0b, 0xac, 0x87, 0x6f, 0x8d, 0x53, 0x88, 0x81, 0x95, 0x37, 0xc7, 0xc7, 0xa6, + 0x6d, 0xdf, 0xc1, 0xdc, 0xc0, 0xf3, 0x77, 0x9b, 0x53, 0x23, 0x0b, 0x92, 0xef, 0x8e, 0x01, 0x4a, + 0x3b, 0x10, 0x10, 0x19, 0x36, 0x7e, 0x87, 0x53, 0x62, 0x18, 0x2a, 0xdf, 0x1b, 0x1b, 0x9a, 0xf6, + 0xfc, 0x24, 0xc0, 0x32, 0xcf, 0x77, 0xd5, 0x91, 0xe5, 0x86, 0xf0, 0xf2, 0xc3, 0xc9, 0xf0, 0x03, + 0x1c, 0x78, 0x2e, 0xcc, 0xe3, 0xc0, 0xc1, 0x73, 0x39, 0x5c, 0xe2, 0xb8, 0x11, 0x07, 0x9e, 0xdf, + 0xaa, 0xdc, 0xdb, 0xc2, 0xc4, 0x73, 0x39, 0x5c, 0xe2, 0xbf, 0xe2, 0x47, 0x58, 0x64, 0x7b, 0xef, + 0xfa, 0x48, 0x61, 0x2f, 0xa0, 0xe5, 0x07, 0x93, 0xa0, 0x93, 0xe6, 0xdb, 0xbb, 0x3f, 0x4f, 0xcb, + 0xc2, 0xc9, 0x69, 0x59, 0xf8, 0x73, 0x5a, 0x16, 0xbe, 0x9d, 0x95, 0xa7, 0x4e, 0xce, 0xca, 0x53, + 0xbf, 0xcf, 0xca, 0x53, 0x6f, 0x6b, 0x96, 0xed, 0xb5, 0xfc, 0xa6, 0x6a, 0xb8, 0x4e, 0xed, 0xa9, + 0x6e, 0x93, 0xe8, 0x6b, 0xa7, 0x76, 0xfe, 0x61, 0x7c, 0x9c, 0xf9, 0x96, 0x0e, 0x7a, 0x48, 0x9b, + 0x85, 0xe8, 0x7b, 0xf8, 0xfe, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x26, 0xee, 0x0d, 0x6e, + 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -928,6 +1020,7 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type MsgClient interface { RegisterValidator(ctx context.Context, in *MsgRegisterValidator, opts ...grpc.CallOption) (*MsgRegisterValidatorResponse, error) + DeRegisterValidator(ctx context.Context, in *MsgDeRegisterValidator, opts ...grpc.CallOption) (*MsgDeRegisterValidatorResponse, error) SendKeyshare(ctx context.Context, in *MsgSendKeyshare, opts ...grpc.CallOption) (*MsgSendKeyshareResponse, error) // this line is used by starport scaffolding # proto/tx/rpc CreateLatestPubKey(ctx context.Context, in *MsgCreateLatestPubKey, opts ...grpc.CallOption) (*MsgCreateLatestPubKeyResponse, error) @@ -954,6 +1047,15 @@ func (c *msgClient) RegisterValidator(ctx context.Context, in *MsgRegisterValida return out, nil } +func (c *msgClient) DeRegisterValidator(ctx context.Context, in *MsgDeRegisterValidator, opts ...grpc.CallOption) (*MsgDeRegisterValidatorResponse, error) { + out := new(MsgDeRegisterValidatorResponse) + err := c.cc.Invoke(ctx, "/fairyring.keyshare.Msg/DeRegisterValidator", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *msgClient) SendKeyshare(ctx context.Context, in *MsgSendKeyshare, opts ...grpc.CallOption) (*MsgSendKeyshareResponse, error) { out := new(MsgSendKeyshareResponse) err := c.cc.Invoke(ctx, "/fairyring.keyshare.Msg/SendKeyshare", in, out, opts...) @@ -1011,6 +1113,7 @@ func (c *msgClient) CreateGeneralKeyShare(ctx context.Context, in *MsgCreateGene // MsgServer is the server API for Msg service. type MsgServer interface { RegisterValidator(context.Context, *MsgRegisterValidator) (*MsgRegisterValidatorResponse, error) + DeRegisterValidator(context.Context, *MsgDeRegisterValidator) (*MsgDeRegisterValidatorResponse, error) SendKeyshare(context.Context, *MsgSendKeyshare) (*MsgSendKeyshareResponse, error) // this line is used by starport scaffolding # proto/tx/rpc CreateLatestPubKey(context.Context, *MsgCreateLatestPubKey) (*MsgCreateLatestPubKeyResponse, error) @@ -1027,6 +1130,9 @@ type UnimplementedMsgServer struct { func (*UnimplementedMsgServer) RegisterValidator(ctx context.Context, req *MsgRegisterValidator) (*MsgRegisterValidatorResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method RegisterValidator not implemented") } +func (*UnimplementedMsgServer) DeRegisterValidator(ctx context.Context, req *MsgDeRegisterValidator) (*MsgDeRegisterValidatorResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method DeRegisterValidator not implemented") +} func (*UnimplementedMsgServer) SendKeyshare(ctx context.Context, req *MsgSendKeyshare) (*MsgSendKeyshareResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method SendKeyshare not implemented") } @@ -1068,6 +1174,24 @@ func _Msg_RegisterValidator_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } +func _Msg_DeRegisterValidator_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgDeRegisterValidator) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).DeRegisterValidator(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/fairyring.keyshare.Msg/DeRegisterValidator", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).DeRegisterValidator(ctx, req.(*MsgDeRegisterValidator)) + } + return interceptor(ctx, in, info, handler) +} + func _Msg_SendKeyshare_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { in := new(MsgSendKeyshare) if err := dec(in); err != nil { @@ -1184,6 +1308,10 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ MethodName: "RegisterValidator", Handler: _Msg_RegisterValidator_Handler, }, + { + MethodName: "DeRegisterValidator", + Handler: _Msg_DeRegisterValidator_Handler, + }, { MethodName: "SendKeyshare", Handler: _Msg_SendKeyshare_Handler, @@ -1273,6 +1401,66 @@ func (m *MsgRegisterValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, e return len(dAtA) - i, nil } +func (m *MsgDeRegisterValidator) 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 *MsgDeRegisterValidator) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDeRegisterValidator) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgDeRegisterValidatorResponse) 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 *MsgDeRegisterValidatorResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgDeRegisterValidatorResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Creator) > 0 { + i -= len(m.Creator) + copy(dAtA[i:], m.Creator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Creator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *MsgSendKeyshare) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -1834,6 +2022,32 @@ func (m *MsgRegisterValidatorResponse) Size() (n int) { return n } +func (m *MsgDeRegisterValidator) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + +func (m *MsgDeRegisterValidatorResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Creator) + if l > 0 { + n += 1 + l + sovTx(uint64(l)) + } + return n +} + func (m *MsgSendKeyshare) Size() (n int) { if m == nil { return 0 @@ -2248,6 +2462,170 @@ func (m *MsgRegisterValidatorResponse) Unmarshal(dAtA []byte) error { } return nil } +func (m *MsgDeRegisterValidator) 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: MsgDeRegisterValidator: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDeRegisterValidator: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Creator", 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.Creator = 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 *MsgDeRegisterValidatorResponse) 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: MsgDeRegisterValidatorResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgDeRegisterValidatorResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Creator", 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.Creator = 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 *MsgSendKeyshare) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 From 0254e3074e6e3aa962cd5f0a72f493ba82007c36 Mon Sep 17 00:00:00 2001 From: p0p3yee Date: Thu, 21 Mar 2024 14:35:41 -0400 Subject: [PATCH 2/2] Add remove authorized address when deregistering --- x/keyshare/keeper/msg_server_deregister_validator.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/x/keyshare/keeper/msg_server_deregister_validator.go b/x/keyshare/keeper/msg_server_deregister_validator.go index a1daabef..6d0260f2 100644 --- a/x/keyshare/keeper/msg_server_deregister_validator.go +++ b/x/keyshare/keeper/msg_server_deregister_validator.go @@ -16,8 +16,12 @@ func (k msgServer) DeRegisterValidator(goCtx context.Context, msg *types.MsgDeRe return nil, types.ErrValidatorNotRegistered.Wrap(msg.Creator) } - if k.GetAuthorizedCount(ctx, msg.Creator) > 0 { - return nil, types.ErrAuthorizedAnotherAddr + for _, v := range k.GetAllAuthorizedAddress(ctx) { + if v.AuthorizedBy == msg.Creator { + k.RemoveAuthorizedAddress(ctx, v.Target) + k.DecreaseAuthorizedCount(ctx, msg.Creator) + break + } } k.RemoveValidatorSet(ctx, msg.Creator)