diff --git a/proto/sequencers/events.proto b/proto/sequencers/events.proto new file mode 100644 index 00000000..bbd165e3 --- /dev/null +++ b/proto/sequencers/events.proto @@ -0,0 +1,29 @@ +syntax = "proto3"; +package rollapp.sequencers.types; + +option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; + +message EventUpdateRewardAddress { + // Operator is the bech32-encoded address of the actor sending the update + string operator = 1; + // RewardAddr is a bech32 encoded sdk acc address + string reward_addr = 2; +} + +message EventUpdateWhitelistedRelayers { + // Operator is the bech32-encoded address of the actor sending the update + string operator = 1; + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 2; +} + +message EventUpsertSequencer { + // Operator is the bech32-encoded address of the actor sending the update + string operator = 1; + // ConsAddr is a tendermint consensus address + string cons_addr = 2; + // RewardAddr is the bech32-encoded sequencer's reward address + string reward_addr = 3; + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 4; +} \ No newline at end of file diff --git a/proto/sequencers/genesis.proto b/proto/sequencers/genesis.proto index f3600a25..9b6120de 100644 --- a/proto/sequencers/genesis.proto +++ b/proto/sequencers/genesis.proto @@ -2,18 +2,10 @@ syntax = "proto3"; package rollapp.sequencers.types; import "gogoproto/gogo.proto"; -import "sequencers/params.proto"; -import "cosmos/staking/v1beta1/staking.proto"; +import "sequencers/sequencers.proto"; option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; -message Sequencer { - // Validator is a convenient storage for e.g operator address and consensus pub key - cosmos.staking.v1beta1.Validator validator = 1; - // RewardAddr is the sdk acc address where the sequencer has opted to receive rewards. Empty if not set. - string reward_addr = 2; -} - // GenesisState defines the module's genesis state. message GenesisState { Params params = 1 [(gogoproto.nullable) = false]; diff --git a/proto/sequencers/params.proto b/proto/sequencers/params.proto deleted file mode 100644 index 7e73b54f..00000000 --- a/proto/sequencers/params.proto +++ /dev/null @@ -1,23 +0,0 @@ -syntax = "proto3"; -package rollapp.sequencers.types; -import "gogoproto/gogo.proto"; -import "google/protobuf/duration.proto"; - -option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; - -// Params defines the parameters for the module. -message Params { - option (gogoproto.equal) = true; - option (gogoproto.goproto_stringer) = false; - - // unbonding_time is the time duration of unbonding. - google.protobuf.Duration unbonding_time = 1 [ - (gogoproto.nullable) = false, - (gogoproto.stdduration) = true, - (gogoproto.moretags) = "yaml:\"unbonding_time\"" - ]; - - // historical_entries is the number of historical entries to persist. - uint32 historical_entries = 2 - [ (gogoproto.moretags) = "yaml:\"historical_entries\"" ]; -} diff --git a/proto/sequencers/query.proto b/proto/sequencers/query.proto index c5666fb9..cf02b2ac 100644 --- a/proto/sequencers/query.proto +++ b/proto/sequencers/query.proto @@ -2,12 +2,10 @@ syntax = "proto3"; package rollapp.sequencers.types; import "gogoproto/gogo.proto"; - import "cosmos/staking/v1beta1/staking.proto"; import "google/api/annotations.proto"; import "cosmos/base/query/v1beta1/pagination.proto"; -import "sequencers/params.proto"; - +import "sequencers/sequencers.proto"; option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; @@ -39,32 +37,32 @@ service Query { // QuerySequencersRequest is request type for Query/Sequencers RPC method. message QuerySequencersRequest { - // status enables to query for sequencers matching a given status. + // Status enables to query for sequencers matching a given status. string status = 1; - // pagination defines an optional pagination for the request. + // Pagination defines an optional pagination for the request. cosmos.base.query.v1beta1.PageRequest pagination = 2; } // QuerySequencersResponse is response type for the Query/Sequencers RPC method message QuerySequencersResponse { - // sequencers contains all the queried sequencers. + // Sequencers contains all the queried sequencers. repeated cosmos.staking.v1beta1.Validator sequencers = 1 [ (gogoproto.nullable) = false ]; - // pagination defines the pagination in the response. + // Pagination defines the pagination in the response. cosmos.base.query.v1beta1.PageResponse pagination = 2; } // QuerySequencerRequest is response type for the Query/Sequencer RPC method message QuerySequencerRequest { - // sequencer_addr defines the sequencer address to query for. + // SequencerAddr defines the sequencer address to query for. string sequencer_addr = 1; } // QuerySequencerResponse is response type for the Query/Sequencer RPC method message QuerySequencerResponse { - // sequencer defines the the sequencer info. + // Sequencer defines the the sequencer info. cosmos.staking.v1beta1.Validator sequencer = 1 [ (gogoproto.nullable) = false ]; } @@ -72,14 +70,14 @@ message QuerySequencerResponse { // QueryHistoricalInfoRequest is request type for the Query/HistoricalInfo RPC // method. message QueryHistoricalInfoRequest { - // height defines at which height to query the historical info. + // Height defines at which height to query the historical info. int64 height = 1; } // QueryHistoricalInfoResponse is response type for the Query/HistoricalInfo RPC // method. message QueryHistoricalInfoResponse { - // hist defines the historical info at the given height. + // Hist defines the historical info at the given height. cosmos.staking.v1beta1.HistoricalInfo hist = 1; } @@ -88,7 +86,7 @@ message QueryParamsRequest {} // QueryParamsResponse is response type for the Query/Params RPC method. message QueryParamsResponse { - // params holds all the parameters of this module. + // Params holds all the parameters of this module. Params params = 1 [ (gogoproto.nullable) = false ]; } diff --git a/proto/sequencers/sequencers.proto b/proto/sequencers/sequencers.proto new file mode 100644 index 00000000..d3ebbf54 --- /dev/null +++ b/proto/sequencers/sequencers.proto @@ -0,0 +1,40 @@ +syntax = "proto3"; +package rollapp.sequencers.types; + +import "gogoproto/gogo.proto"; +import "google/protobuf/duration.proto"; +import "cosmos/staking/v1beta1/staking.proto"; + +option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; + +// Params defines the parameters for the module. +message Params { + option (gogoproto.equal) = true; + option (gogoproto.goproto_stringer) = false; + + // UnbondingTime is the time duration of unbonding. + google.protobuf.Duration unbonding_time = 1 [ + (gogoproto.nullable) = false, + (gogoproto.stdduration) = true, + (gogoproto.moretags) = "yaml:\"unbonding_time\"" + ]; + + // HistoricalEntries is the number of historical entries to persist. + uint32 historical_entries = 2 + [ (gogoproto.moretags) = "yaml:\"historical_entries\"" ]; +} + +message Sequencer { + // Validator is a convenient storage for e.g operator address and consensus pub key + cosmos.staking.v1beta1.Validator validator = 1; + // RewardAddr is the sdk acc address where the sequencer has opted to receive rewards. Empty if not set. + string reward_addr = 2; + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 3; +} + +// WhitelistedRelayers is used for storing the whitelisted relater list in the state +message WhitelistedRelayers { + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 1; +} diff --git a/proto/sequencers/tx.proto b/proto/sequencers/tx.proto index 4a117189..5caf56e0 100644 --- a/proto/sequencers/tx.proto +++ b/proto/sequencers/tx.proto @@ -1,8 +1,6 @@ syntax = "proto3"; package rollapp.sequencers.types; -import "gogoproto/gogo.proto"; -import "cosmos/staking/v1beta1/staking.proto"; import "cosmos/msg/v1/msg.proto"; import "google/protobuf/any.proto"; @@ -10,32 +8,45 @@ option go_package = "github.com/dymensionxyz/dymension-rdk/x/sequencers/types"; // Msg defines the Msg service. service Msg { - rpc CreateSequencer(MsgCreateSequencer) returns (MsgCreateSequencerResponse); - rpc UpdateSequencer(MsgUpdateSequencer) returns (MsgUpdateSequencerResponse); + // Messages + rpc UpdateRewardAddress(MsgUpdateRewardAddress) returns (MsgUpdateRewardAddressResponse); + rpc UpdateWhitelistedRelayers(MsgUpdateWhitelistedRelayers) returns (MsgUpdateWhitelistedRelayersResponse); + + // Consensus Messages + rpc UpsertSequencer(ConsensusMsgUpsertSequencer) returns (ConsensusMsgUpsertSequencerResponse); } -message MsgCreateSequencer { +message MsgUpdateRewardAddress { option (cosmos.msg.v1.signer) = "operator"; - // Operator is the bech32-encoded address of the actor sending the update - must be val addr + // Operator is the bech32-encoded address of the actor sending the update string operator = 1; - // PubKey is a tendermint consensus pub key - google.protobuf.Any pub_key = 2; - // Signature is operator signed with the private key of pub_key - bytes signature = 3; + // RewardAddr is a bech32 encoded sdk acc address + string reward_addr = 2; } -message MsgCreateSequencerResponse { +message MsgUpdateRewardAddressResponse {} +message MsgUpdateWhitelistedRelayers { + option (cosmos.msg.v1.signer) = "operator"; + // Operator is the bech32-encoded address of the actor sending the update + string operator = 1; + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 2; } -message MsgUpdateSequencer { +message MsgUpdateWhitelistedRelayersResponse {} + +// ConsensusMsgUpsertSequencer is a consensus message to upsert the sequencer. +message ConsensusMsgUpsertSequencer { option (cosmos.msg.v1.signer) = "operator"; - // Operator is the bech32-encoded address of the actor sending the update - must be val addr + // Operator is the bech32-encoded address of the actor sending the update string operator = 1; - // RewardAddr is a bech32 encoded sdk acc address + // ConsPubKey is a tendermint consensus pub key + google.protobuf.Any cons_pub_key = 2; + // RewardAddr is the bech32-encoded sequencer's reward address string reward_addr = 3; + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + repeated string relayers = 4; } -message MsgUpdateSequencerResponse { - -} +message ConsensusMsgUpsertSequencerResponse {} diff --git a/server/commands/rollback.go b/server/commands/rollback.go index d9e6edaa..63a1425e 100644 --- a/server/commands/rollback.go +++ b/server/commands/rollback.go @@ -7,7 +7,6 @@ import ( "github.com/dymensionxyz/dymint/block" dymintconf "github.com/dymensionxyz/dymint/config" dymintconv "github.com/dymensionxyz/dymint/conv" - "github.com/dymensionxyz/dymint/store" "github.com/tendermint/tendermint/config" "github.com/tendermint/tendermint/node" @@ -17,8 +16,9 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/server/types" - "github.com/dymensionxyz/dymension-rdk/utils" "github.com/spf13/cobra" + + "github.com/dymensionxyz/dymension-rdk/utils" ) // RollbackCmd rollbacks the app multistore to specific height and updates dymint state according to it diff --git a/utils/uevent/events.go b/utils/uevent/events.go new file mode 100644 index 00000000..5a028a9f --- /dev/null +++ b/utils/uevent/events.go @@ -0,0 +1,71 @@ +// Package uevent is a copy of https://github.com/dymensionxyz/sdk-utils/tree/main/utils/uevent. +// TODO: import sdk-utils directly when the RDK is updated to SDK v0.47 and further. +package uevent + +import ( + "encoding/json" + "slices" + + "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/gogoproto/proto" + abci "github.com/tendermint/tendermint/abci/types" + "golang.org/x/exp/maps" +) + +// EmitTypedEvent takes a typed event and emits it. +// The original EmitTypedEvent from cosmos-sdk adds double quotes around the string attributes, +// which makes it difficult, if not impossible to query/subscribe to those events. +// See https://github.com/cosmos/cosmos-sdk/issues/12592 and +// https://github.com/dymensionxyz/sdk-utils/pull/5#discussion_r1724688379 +func EmitTypedEvent(ctx sdk.Context, tev proto.Message) error { + event, err := TypedEventToEvent(tev) + if err != nil { + return err + } + ctx.EventManager().EmitEvent(event) + return nil +} + +// TypedEventToEvent takes typed event and converts to Event object +func TypedEventToEvent(tev proto.Message) (ev sdk.Event, err error) { + evtType := proto.MessageName(tev) + + var evtJSON []byte + evtJSON, err = codec.ProtoMarshalJSON(tev, nil) + if err != nil { + return + } + + var attrMap map[string]json.RawMessage + if err = json.Unmarshal(evtJSON, &attrMap); err != nil { + return + } + + // sort the keys to ensure the order is always the same + keys := maps.Keys(attrMap) + slices.Sort(keys) + + attrs := make([]abci.EventAttribute, 0, len(attrMap)) + for _, k := range keys { + v := attrMap[k] + attrs = append(attrs, abci.EventAttribute{ + Key: []byte(k), + Value: []byte(removeSurroundingQuotes(v)), + }) + } + + ev = sdk.Event{ + Type: evtType, + Attributes: attrs, + } + return +} + +func removeSurroundingQuotes(bz []byte) string { + const dquote = 34 + if len(bz) > 1 && bz[0] == dquote && bz[len(bz)-1] == dquote { + return string(bz[1 : len(bz)-1]) + } + return string(bz) +} diff --git a/x/sequencers/keeper/grpc_query.go b/x/sequencers/keeper/grpc_query.go index 8732259c..1417c5f0 100644 --- a/x/sequencers/keeper/grpc_query.go +++ b/x/sequencers/keeper/grpc_query.go @@ -4,10 +4,10 @@ import ( "context" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" - "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + + "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" ) type Querier struct { diff --git a/x/sequencers/keeper/keeper.go b/x/sequencers/keeper/keeper.go index d3a309a3..d29eea1e 100644 --- a/x/sequencers/keeper/keeper.go +++ b/x/sequencers/keeper/keeper.go @@ -4,14 +4,15 @@ import ( "fmt" "time" - "github.com/tendermint/tendermint/libs/log" - + "cosmossdk.io/collections" "github.com/cosmos/cosmos-sdk/codec" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/tendermint/tendermint/libs/log" + + "github.com/dymensionxyz/dymension-rdk/utils/collcompat" "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" ) @@ -28,6 +29,8 @@ type Keeper struct { cdc codec.BinaryCodec storeKey storetypes.StoreKey paramstore paramtypes.Subspace + + whitelistedRelayers collections.Map[sdk.ValAddress, types.WhitelistedRelayers] } func NewKeeper( @@ -40,10 +43,19 @@ func NewKeeper( ps = ps.WithKeyTable(types.ParamKeyTable()) } + sb := collections.NewSchemaBuilder(collcompat.NewKVStoreService(storeKey)) + return &Keeper{ cdc: cdc, storeKey: storeKey, paramstore: ps, + whitelistedRelayers: collections.NewMap( + sb, + types.WhitelistedRelayersPrefix(), + "whitelisted_relayers", + collcompat.ValAddressKey, + collcompat.ProtoValue[types.WhitelistedRelayers](cdc), + ), } } diff --git a/x/sequencers/keeper/msg_server.go b/x/sequencers/keeper/msg_server.go index 75e8b056..11ea819a 100644 --- a/x/sequencers/keeper/msg_server.go +++ b/x/sequencers/keeper/msg_server.go @@ -2,68 +2,109 @@ package keeper import ( "context" + "fmt" errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" "github.com/dymensionxyz/gerr-cosmos/gerrc" + + "github.com/dymensionxyz/dymension-rdk/utils/uevent" + "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" ) var _ types.MsgServer = msgServer{} -type msgServer struct { - Keeper -} +type msgServer struct{ Keeper } func NewMsgServerImpl(keeper Keeper) types.MsgServer { return &msgServer{Keeper: keeper} } -func (m msgServer) CreateSequencer(goCtx context.Context, msg *types.MsgCreateSequencer) (*types.MsgCreateSequencerResponse, error) { +func (m msgServer) UpdateRewardAddress(goCtx context.Context, msg *types.MsgUpdateRewardAddress) (*types.MsgUpdateRewardAddressResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - operator := msg.MustOperatorAddr() // checked in validate basic - if _, ok := m.GetSequencer(ctx, operator); ok { - return nil, gerrc.ErrAlreadyExists + + // all must-methods are safe to use since they're validated in ValidateBasic + + operator := msg.MustOperatorAddr() + seq, ok := m.GetSequencer(ctx, operator) + if !ok { + return nil, errorsmod.Wrap(gerrc.ErrNotFound, "sequencer") } - v := msg.Validator() - m.SetSequencer(ctx, v) + rewardAddr := msg.MustRewardAcc() + m.SetRewardAddr(ctx, seq, rewardAddr) - consAddr, err := v.GetConsAddr() + err := uevent.EmitTypedEvent(ctx, &types.EventUpdateRewardAddress{ + Operator: operator.String(), + RewardAddr: rewardAddr.String(), + }) if err != nil { - panic(err) // it must be ok because we used it to check sig + return nil, fmt.Errorf("emit event: %w", err) } - ctx.EventManager().EmitEvent(sdk.NewEvent( - types.EventCreateSequencer, - sdk.NewAttribute(types.AttributeKeyConsAddr, consAddr.String()), - sdk.NewAttribute(types.AttributeKeyOperatorAddr, v.OperatorAddress), - )) - - return &types.MsgCreateSequencerResponse{}, nil + return &types.MsgUpdateRewardAddressResponse{}, nil } -func (m msgServer) UpdateSequencer(goCtx context.Context, msg *types.MsgUpdateSequencer) (*types.MsgUpdateSequencerResponse, error) { +func (m msgServer) UpdateWhitelistedRelayers(goCtx context.Context, msg *types.MsgUpdateWhitelistedRelayers) (*types.MsgUpdateWhitelistedRelayersResponse, error) { ctx := sdk.UnwrapSDKContext(goCtx) - operator := msg.MustOperatorAddr() // checked in validate basic + // all must-methods are safe to use since they're validated in ValidateBasic + + operator := msg.MustOperatorAddr() seq, ok := m.GetSequencer(ctx, operator) if !ok { return nil, errorsmod.Wrap(gerrc.ErrNotFound, "sequencer") } - m.SetRewardAddr(ctx, seq, msg.MustRewardAcc()) // checked in validate basic + relayers := types.MustNewWhitelistedRelayers(msg.Relayers) + err := m.SetWhitelistedRelayers(ctx, seq, relayers) + if err != nil { + return nil, fmt.Errorf("set whitelisted relayers: %w", err) + } + + err = uevent.EmitTypedEvent(ctx, &types.EventUpdateWhitelistedRelayers{ + Operator: seq.OperatorAddress, + Relayers: relayers.Relayers, + }) + if err != nil { + return nil, fmt.Errorf("emit event: %w", err) + } + + return &types.MsgUpdateWhitelistedRelayersResponse{}, nil +} + +func (m msgServer) UpsertSequencer(goCtx context.Context, msg *types.ConsensusMsgUpsertSequencer) (*types.ConsensusMsgUpsertSequencerResponse, error) { + ctx := sdk.UnwrapSDKContext(goCtx) + + // all must-methods are safe to use since they're validated in ValidateBasic + + // save the validator + v := msg.MustValidator() + m.SetSequencer(ctx, v) + + // save the reward address + rewardAddr := msg.MustRewardAddr() + m.SetRewardAddr(ctx, v, rewardAddr) + + // save the whitelisted relayer list + err := m.SetWhitelistedRelayers(ctx, v, types.MustNewWhitelistedRelayers(msg.Relayers)) + if err != nil { + return nil, fmt.Errorf("set whitelisted relayers: %w", err) + } + + consAddr, err := v.GetConsAddr() + if err != nil { + return nil, fmt.Errorf("get validator consensus addr: %w", err) + } - consAddr, err := seq.GetConsAddr() + err = uevent.EmitTypedEvent(ctx, &types.EventUpsertSequencer{ + Operator: msg.MustOperatorAddr().String(), + ConsAddr: consAddr.String(), + RewardAddr: rewardAddr.String(), + }) if err != nil { - return nil, errorsmod.Wrap(gerrc.ErrInternal, "expected to get valid cons addr") + return nil, fmt.Errorf("emit event: %w", err) } - ctx.EventManager().EmitEvent(sdk.NewEvent( - types.EventUpdateSequencer, - sdk.NewAttribute(types.AttributeKeyConsAddr, consAddr.String()), - sdk.NewAttribute(types.AttributeKeyOperatorAddr, seq.OperatorAddress), - sdk.NewAttribute(types.AttributeKeyRewardAddr, msg.MustRewardAcc().String()), - )) - return &types.MsgUpdateSequencerResponse{}, nil + return &types.ConsensusMsgUpsertSequencerResponse{}, nil } diff --git a/x/sequencers/keeper/msg_server_test.go b/x/sequencers/keeper/msg_server_test.go index 955df412..45bb3138 100644 --- a/x/sequencers/keeper/msg_server_test.go +++ b/x/sequencers/keeper/msg_server_test.go @@ -3,18 +3,15 @@ package keeper_test import ( "testing" - errorsmod "cosmossdk.io/errors" - codectypes "github.com/cosmos/cosmos-sdk/codec/types" - "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/stretchr/testify/require" + testkeepers "github.com/dymensionxyz/dymension-rdk/testutil/keepers" "github.com/dymensionxyz/dymension-rdk/testutil/utils" "github.com/dymensionxyz/dymension-rdk/x/sequencers/keeper" "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" - "github.com/dymensionxyz/gerr-cosmos/gerrc" - "github.com/stretchr/testify/require" ) func TestCreateUpdateHappyPath(t *testing.T) { @@ -61,41 +58,3 @@ func TestCreateUpdateHappyPath(t *testing.T) { require.Equal(t, rewardAddr, got) } } - -func TestCreateSecure(t *testing.T) { - valid := func() *types.MsgCreateSequencer { - operator := utils.Proposer.GetOperator() - signer := func(msg []byte) ([]byte, cryptotypes.PubKey, error) { - bz, err := utils.ConsPrivKey.Sign(msg) - return bz, utils.ConsPrivKey.PubKey(), err - } - valid, err := types.BuildMsgCreateSequencer(signer, operator) - require.NoError(t, err) - return valid - } - t.Run("ok", func(t *testing.T) { - m := valid() - require.NoError(t, m.ValidateBasic()) - }) - t.Run("wrong oper", func(t *testing.T) { - m := valid() - m.Operator = sdk.ValAddress(secp256k1.GenPrivKey().PubKey().Address()).String() - err := m.ValidateBasic() - require.True(t, errorsmod.IsOf(err, gerrc.ErrUnauthenticated)) - }) - t.Run("wrong pub key", func(t *testing.T) { - m := valid() - pk := ed25519.GenPrivKey().PubKey() - pkA, err := codectypes.NewAnyWithValue(pk) - require.NoError(t, err) - m.PubKey = pkA - err = m.ValidateBasic() - require.True(t, errorsmod.IsOf(err, gerrc.ErrUnauthenticated)) - }) - t.Run("wrong sig", func(t *testing.T) { - m := valid() - m.Signature = []byte("foo") - err := m.ValidateBasic() - require.True(t, errorsmod.IsOf(err, gerrc.ErrUnauthenticated)) - }) -} diff --git a/x/sequencers/keeper/sequencer.go b/x/sequencers/keeper/sequencer.go index ffd999eb..3f51feb9 100644 --- a/x/sequencers/keeper/sequencer.go +++ b/x/sequencers/keeper/sequencer.go @@ -1,8 +1,10 @@ package keeper import ( + "cosmossdk.io/collections" sdk "github.com/cosmos/cosmos-sdk/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" ) @@ -93,3 +95,21 @@ func (k Keeper) GetRewardAddrByConsAddr(ctx sdk.Context, consAddr sdk.ConsAddres } return k.GetRewardAddr(ctx, seq.GetOperator()) } + +// SetWhitelistedRelayers sets the list of whitelisted relayer addresses +func (k Keeper) SetWhitelistedRelayers(ctx sdk.Context, sequencer stakingtypes.Validator, relayers types.WhitelistedRelayers) error { + return k.whitelistedRelayers.Set(ctx, sequencer.GetOperator(), relayers) +} + +// GetWhitelistedRelayers gets the list of whitelisted relayer addresses +func (k Keeper) GetWhitelistedRelayers(ctx sdk.Context, operator sdk.ValAddress) (types.WhitelistedRelayers, error) { + return k.whitelistedRelayers.Get(ctx, operator) +} + +func (k Keeper) GetWhitelistedRelayersByConsAddr(ctx sdk.Context, consAddr sdk.ConsAddress) (types.WhitelistedRelayers, error) { + seq, ok := k.GetSequencerByConsAddr(ctx, consAddr) + if !ok { + return types.WhitelistedRelayers{}, collections.ErrNotFound + } + return k.whitelistedRelayers.Get(ctx, seq.GetOperator()) +} diff --git a/x/sequencers/types/codec.go b/x/sequencers/types/codec.go index 67de15a5..318ec167 100644 --- a/x/sequencers/types/codec.go +++ b/x/sequencers/types/codec.go @@ -13,8 +13,9 @@ func RegisterCodec(cdc *codec.LegacyAmino) { func RegisterInterfaces(registry cdctypes.InterfaceRegistry) { registry.RegisterImplementations( (*sdk.Msg)(nil), - &MsgCreateSequencer{}, - &MsgUpdateSequencer{}, + &MsgUpdateRewardAddress{}, + &MsgUpdateWhitelistedRelayers{}, + &ConsensusMsgUpsertSequencer{}, ) msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc) diff --git a/x/sequencers/types/events.go b/x/sequencers/types/events.go deleted file mode 100644 index cc97ecf2..00000000 --- a/x/sequencers/types/events.go +++ /dev/null @@ -1,10 +0,0 @@ -package types - -const ( - EventCreateSequencer = "create_sequencer" - EventUpdateSequencer = "update_sequencer" - - AttributeKeyConsAddr = "cons_addr" - AttributeKeyOperatorAddr = "operator_addr" - AttributeKeyRewardAddr = "reward_addr" -) diff --git a/x/sequencers/types/events.pb.go b/x/sequencers/types/events.pb.go new file mode 100644 index 00000000..a0afd5b8 --- /dev/null +++ b/x/sequencers/types/events.pb.go @@ -0,0 +1,933 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: sequencers/events.proto + +package types + +import ( + fmt "fmt" + proto "github.com/gogo/protobuf/proto" + io "io" + math "math" + math_bits "math/bits" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +type EventUpdateRewardAddress struct { + // Operator is the bech32-encoded address of the actor sending the update + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // RewardAddr is a bech32 encoded sdk acc address + RewardAddr string `protobuf:"bytes,2,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` +} + +func (m *EventUpdateRewardAddress) Reset() { *m = EventUpdateRewardAddress{} } +func (m *EventUpdateRewardAddress) String() string { return proto.CompactTextString(m) } +func (*EventUpdateRewardAddress) ProtoMessage() {} +func (*EventUpdateRewardAddress) Descriptor() ([]byte, []int) { + return fileDescriptor_56f991c7cadf9a70, []int{0} +} +func (m *EventUpdateRewardAddress) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventUpdateRewardAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventUpdateRewardAddress.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 *EventUpdateRewardAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventUpdateRewardAddress.Merge(m, src) +} +func (m *EventUpdateRewardAddress) XXX_Size() int { + return m.Size() +} +func (m *EventUpdateRewardAddress) XXX_DiscardUnknown() { + xxx_messageInfo_EventUpdateRewardAddress.DiscardUnknown(m) +} + +var xxx_messageInfo_EventUpdateRewardAddress proto.InternalMessageInfo + +func (m *EventUpdateRewardAddress) GetOperator() string { + if m != nil { + return m.Operator + } + return "" +} + +func (m *EventUpdateRewardAddress) GetRewardAddr() string { + if m != nil { + return m.RewardAddr + } + return "" +} + +type EventUpdateWhitelistedRelayers struct { + // Operator is the bech32-encoded address of the actor sending the update + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,2,rep,name=relayers,proto3" json:"relayers,omitempty"` +} + +func (m *EventUpdateWhitelistedRelayers) Reset() { *m = EventUpdateWhitelistedRelayers{} } +func (m *EventUpdateWhitelistedRelayers) String() string { return proto.CompactTextString(m) } +func (*EventUpdateWhitelistedRelayers) ProtoMessage() {} +func (*EventUpdateWhitelistedRelayers) Descriptor() ([]byte, []int) { + return fileDescriptor_56f991c7cadf9a70, []int{1} +} +func (m *EventUpdateWhitelistedRelayers) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventUpdateWhitelistedRelayers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventUpdateWhitelistedRelayers.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 *EventUpdateWhitelistedRelayers) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventUpdateWhitelistedRelayers.Merge(m, src) +} +func (m *EventUpdateWhitelistedRelayers) XXX_Size() int { + return m.Size() +} +func (m *EventUpdateWhitelistedRelayers) XXX_DiscardUnknown() { + xxx_messageInfo_EventUpdateWhitelistedRelayers.DiscardUnknown(m) +} + +var xxx_messageInfo_EventUpdateWhitelistedRelayers proto.InternalMessageInfo + +func (m *EventUpdateWhitelistedRelayers) GetOperator() string { + if m != nil { + return m.Operator + } + return "" +} + +func (m *EventUpdateWhitelistedRelayers) GetRelayers() []string { + if m != nil { + return m.Relayers + } + return nil +} + +type EventUpsertSequencer struct { + // Operator is the bech32-encoded address of the actor sending the update + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // ConsAddr is a tendermint consensus address + ConsAddr string `protobuf:"bytes,2,opt,name=cons_addr,json=consAddr,proto3" json:"cons_addr,omitempty"` + // RewardAddr is the bech32-encoded sequencer's reward address + RewardAddr string `protobuf:"bytes,3,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,4,rep,name=relayers,proto3" json:"relayers,omitempty"` +} + +func (m *EventUpsertSequencer) Reset() { *m = EventUpsertSequencer{} } +func (m *EventUpsertSequencer) String() string { return proto.CompactTextString(m) } +func (*EventUpsertSequencer) ProtoMessage() {} +func (*EventUpsertSequencer) Descriptor() ([]byte, []int) { + return fileDescriptor_56f991c7cadf9a70, []int{2} +} +func (m *EventUpsertSequencer) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *EventUpsertSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_EventUpsertSequencer.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 *EventUpsertSequencer) XXX_Merge(src proto.Message) { + xxx_messageInfo_EventUpsertSequencer.Merge(m, src) +} +func (m *EventUpsertSequencer) XXX_Size() int { + return m.Size() +} +func (m *EventUpsertSequencer) XXX_DiscardUnknown() { + xxx_messageInfo_EventUpsertSequencer.DiscardUnknown(m) +} + +var xxx_messageInfo_EventUpsertSequencer proto.InternalMessageInfo + +func (m *EventUpsertSequencer) GetOperator() string { + if m != nil { + return m.Operator + } + return "" +} + +func (m *EventUpsertSequencer) GetConsAddr() string { + if m != nil { + return m.ConsAddr + } + return "" +} + +func (m *EventUpsertSequencer) GetRewardAddr() string { + if m != nil { + return m.RewardAddr + } + return "" +} + +func (m *EventUpsertSequencer) GetRelayers() []string { + if m != nil { + return m.Relayers + } + return nil +} + +func init() { + proto.RegisterType((*EventUpdateRewardAddress)(nil), "rollapp.sequencers.types.EventUpdateRewardAddress") + proto.RegisterType((*EventUpdateWhitelistedRelayers)(nil), "rollapp.sequencers.types.EventUpdateWhitelistedRelayers") + proto.RegisterType((*EventUpsertSequencer)(nil), "rollapp.sequencers.types.EventUpsertSequencer") +} + +func init() { proto.RegisterFile("sequencers/events.proto", fileDescriptor_56f991c7cadf9a70) } + +var fileDescriptor_56f991c7cadf9a70 = []byte{ + // 284 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x91, 0xbf, 0x4e, 0xf3, 0x30, + 0x14, 0xc5, 0xe3, 0xf6, 0xd3, 0xa7, 0xd4, 0x6c, 0x11, 0x12, 0x51, 0x91, 0x4c, 0x95, 0x89, 0x85, + 0x64, 0x60, 0x61, 0x05, 0x89, 0x17, 0x08, 0x42, 0x45, 0x2c, 0xc8, 0x8d, 0xaf, 0x68, 0x44, 0x6a, + 0x9b, 0x7b, 0x5d, 0x68, 0x78, 0x06, 0x06, 0x1e, 0x8b, 0xb1, 0x23, 0x23, 0x4a, 0x5e, 0x04, 0x25, + 0xea, 0x9f, 0xb4, 0x43, 0xc7, 0xe3, 0x7b, 0x7c, 0xf4, 0x3b, 0x3a, 0xfc, 0x84, 0xe0, 0x75, 0x0e, + 0x3a, 0x03, 0xa4, 0x04, 0xde, 0x40, 0x3b, 0x8a, 0x2d, 0x1a, 0x67, 0x82, 0x10, 0x4d, 0x51, 0x48, + 0x6b, 0xe3, 0xad, 0x21, 0x76, 0xa5, 0x05, 0x8a, 0xc6, 0x3c, 0xbc, 0x6d, 0x9c, 0xf7, 0x56, 0x49, + 0x07, 0x29, 0xbc, 0x4b, 0x54, 0xd7, 0x4a, 0x21, 0x10, 0x05, 0x43, 0xee, 0x1b, 0x0b, 0x28, 0x9d, + 0xc1, 0x90, 0x8d, 0xd8, 0xf9, 0x20, 0xdd, 0xe8, 0xe0, 0x8c, 0x1f, 0x61, 0x6b, 0x7e, 0x92, 0x4a, + 0x61, 0xd8, 0x6b, 0xcf, 0x1c, 0x37, 0xff, 0xa3, 0x07, 0x2e, 0x3a, 0xc1, 0xe3, 0x69, 0xee, 0xa0, + 0xc8, 0xc9, 0x81, 0x4a, 0xa1, 0x90, 0x25, 0xe0, 0xe1, 0xf8, 0x21, 0xf7, 0x71, 0xe5, 0x0b, 0x7b, + 0xa3, 0x7e, 0x73, 0x5b, 0xeb, 0xe8, 0x93, 0xf1, 0xe3, 0x55, 0x34, 0x01, 0xba, 0xbb, 0x75, 0xa5, + 0x83, 0x81, 0xa7, 0x7c, 0x90, 0x19, 0x4d, 0x5d, 0x5a, 0xbf, 0x79, 0x68, 0x58, 0xf7, 0xcb, 0xf4, + 0xf7, 0xcb, 0xec, 0xe0, 0xfc, 0xdb, 0xc5, 0xb9, 0x49, 0xbf, 0x2b, 0xc1, 0x96, 0x95, 0x60, 0xbf, + 0x95, 0x60, 0x5f, 0xb5, 0xf0, 0x96, 0xb5, 0xf0, 0x7e, 0x6a, 0xe1, 0x3d, 0x5e, 0x3d, 0xe7, 0x6e, + 0x3a, 0x9f, 0xc4, 0x99, 0x99, 0x25, 0xaa, 0x9c, 0x81, 0xa6, 0xdc, 0xe8, 0x45, 0xf9, 0xb1, 0x15, + 0x17, 0xa8, 0x5e, 0x92, 0x45, 0xd2, 0x99, 0xad, 0x5d, 0x65, 0xf2, 0xbf, 0x9d, 0xed, 0xf2, 0x2f, + 0x00, 0x00, 0xff, 0xff, 0x9b, 0xce, 0x56, 0x40, 0xd1, 0x01, 0x00, 0x00, +} + +func (m *EventUpdateRewardAddress) 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 *EventUpdateRewardAddress) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventUpdateRewardAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.RewardAddr) > 0 { + i -= len(m.RewardAddr) + copy(dAtA[i:], m.RewardAddr) + i = encodeVarintEvents(dAtA, i, uint64(len(m.RewardAddr))) + i-- + dAtA[i] = 0x12 + } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Operator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *EventUpdateWhitelistedRelayers) 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 *EventUpdateWhitelistedRelayers) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventUpdateWhitelistedRelayers) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x12 + } + } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Operator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *EventUpsertSequencer) 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 *EventUpsertSequencer) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *EventUpsertSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x22 + } + } + if len(m.RewardAddr) > 0 { + i -= len(m.RewardAddr) + copy(dAtA[i:], m.RewardAddr) + i = encodeVarintEvents(dAtA, i, uint64(len(m.RewardAddr))) + i-- + dAtA[i] = 0x1a + } + if len(m.ConsAddr) > 0 { + i -= len(m.ConsAddr) + copy(dAtA[i:], m.ConsAddr) + i = encodeVarintEvents(dAtA, i, uint64(len(m.ConsAddr))) + i-- + dAtA[i] = 0x12 + } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintEvents(dAtA, i, uint64(len(m.Operator))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func encodeVarintEvents(dAtA []byte, offset int, v uint64) int { + offset -= sovEvents(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *EventUpdateRewardAddress) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = len(m.RewardAddr) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + return n +} + +func (m *EventUpdateWhitelistedRelayers) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovEvents(uint64(l)) + } + } + return n +} + +func (m *EventUpsertSequencer) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = len(m.ConsAddr) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + l = len(m.RewardAddr) + if l > 0 { + n += 1 + l + sovEvents(uint64(l)) + } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovEvents(uint64(l)) + } + } + return n +} + +func sovEvents(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozEvents(x uint64) (n int) { + return sovEvents(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *EventUpdateRewardAddress) 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 ErrIntOverflowEvents + } + 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: EventUpdateRewardAddress: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventUpdateRewardAddress: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RewardAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipEvents(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthEvents + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *EventUpdateWhitelistedRelayers) 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 ErrIntOverflowEvents + } + 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: EventUpdateWhitelistedRelayers: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventUpdateWhitelistedRelayers: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipEvents(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthEvents + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *EventUpsertSequencer) 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 ErrIntOverflowEvents + } + 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: EventUpsertSequencer: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: EventUpsertSequencer: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Operator", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.ConsAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RewardAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowEvents + } + 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 ErrInvalidLengthEvents + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthEvents + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipEvents(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthEvents + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipEvents(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowEvents + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowEvents + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowEvents + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthEvents + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupEvents + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthEvents + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthEvents = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowEvents = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupEvents = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/sequencers/types/genesis.go b/x/sequencers/types/genesis.go index c5dd86a0..4e18ce5d 100644 --- a/x/sequencers/types/genesis.go +++ b/x/sequencers/types/genesis.go @@ -8,9 +8,6 @@ import ( "github.com/dymensionxyz/gerr-cosmos/gerrc" ) -// DefaultIndex is the default capability global index -const DefaultIndex uint64 = 1 - // DefaultGenesis returns the default Capability genesis state func DefaultGenesis() *GenesisState { return &GenesisState{ @@ -41,6 +38,10 @@ func (gs GenesisState) ValidateGenesis() error { return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "reward acc") } } + err = WhitelistedRelayers{Relayers: s.Relayers}.Validate() + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "validate whitelisted relayer") + } } return nil } diff --git a/x/sequencers/types/genesis.pb.go b/x/sequencers/types/genesis.pb.go index 88cabf84..628966a1 100644 --- a/x/sequencers/types/genesis.pb.go +++ b/x/sequencers/types/genesis.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - types "github.com/cosmos/cosmos-sdk/x/staking/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -24,60 +23,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type Sequencer struct { - // Validator is a convenient storage for e.g operator address and consensus pub key - Validator *types.Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator,omitempty"` - // RewardAddr is the sdk acc address where the sequencer has opted to receive rewards. Empty if not set. - RewardAddr string `protobuf:"bytes,2,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` -} - -func (m *Sequencer) Reset() { *m = Sequencer{} } -func (m *Sequencer) String() string { return proto.CompactTextString(m) } -func (*Sequencer) ProtoMessage() {} -func (*Sequencer) Descriptor() ([]byte, []int) { - return fileDescriptor_56ef324f83e482d4, []int{0} -} -func (m *Sequencer) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *Sequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - if deterministic { - return xxx_messageInfo_Sequencer.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 *Sequencer) XXX_Merge(src proto.Message) { - xxx_messageInfo_Sequencer.Merge(m, src) -} -func (m *Sequencer) XXX_Size() int { - return m.Size() -} -func (m *Sequencer) XXX_DiscardUnknown() { - xxx_messageInfo_Sequencer.DiscardUnknown(m) -} - -var xxx_messageInfo_Sequencer proto.InternalMessageInfo - -func (m *Sequencer) GetValidator() *types.Validator { - if m != nil { - return m.Validator - } - return nil -} - -func (m *Sequencer) GetRewardAddr() string { - if m != nil { - return m.RewardAddr - } - return "" -} - // GenesisState defines the module's genesis state. type GenesisState struct { Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` @@ -89,7 +34,7 @@ func (m *GenesisState) Reset() { *m = GenesisState{} } func (m *GenesisState) String() string { return proto.CompactTextString(m) } func (*GenesisState) ProtoMessage() {} func (*GenesisState) Descriptor() ([]byte, []int) { - return fileDescriptor_56ef324f83e482d4, []int{1} + return fileDescriptor_56ef324f83e482d4, []int{0} } func (m *GenesisState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -133,77 +78,28 @@ func (m *GenesisState) GetSequencers() []Sequencer { } func init() { - proto.RegisterType((*Sequencer)(nil), "rollapp.sequencers.types.Sequencer") proto.RegisterType((*GenesisState)(nil), "rollapp.sequencers.types.GenesisState") } func init() { proto.RegisterFile("sequencers/genesis.proto", fileDescriptor_56ef324f83e482d4) } var fileDescriptor_56ef324f83e482d4 = []byte{ - // 328 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x31, 0x4e, 0xf3, 0x30, - 0x18, 0x86, 0xe3, 0xb6, 0xaa, 0xfe, 0xba, 0xff, 0x80, 0x22, 0x24, 0xa2, 0x0e, 0x6e, 0x28, 0x0c, - 0x5d, 0xb0, 0xd5, 0xb2, 0x30, 0x81, 0xe8, 0x82, 0x60, 0x42, 0xa9, 0xc4, 0xc0, 0x82, 0xdc, 0xda, - 0x0a, 0x51, 0x9b, 0x38, 0xd8, 0x6e, 0x69, 0x38, 0x05, 0x37, 0xe0, 0x3a, 0x1d, 0x3b, 0x32, 0x21, - 0x94, 0x5c, 0x04, 0x11, 0x27, 0x24, 0x4b, 0xb7, 0x7c, 0xd1, 0xf3, 0x3e, 0x9f, 0x5f, 0x1b, 0x3a, - 0x8a, 0xbf, 0xac, 0x78, 0x34, 0xe7, 0x52, 0x11, 0x9f, 0x47, 0x5c, 0x05, 0x0a, 0xc7, 0x52, 0x68, - 0x61, 0x3b, 0x52, 0x2c, 0x97, 0x34, 0x8e, 0x71, 0x45, 0x60, 0x9d, 0xc4, 0x5c, 0xf5, 0x0e, 0x7d, - 0xe1, 0x8b, 0x1c, 0x22, 0xbf, 0x5f, 0x86, 0xef, 0x1d, 0xd5, 0x4c, 0x31, 0x95, 0x34, 0x2c, 0x44, - 0xbd, 0xd3, 0xb9, 0x50, 0xa1, 0x50, 0x44, 0x69, 0xba, 0x08, 0x22, 0x9f, 0xac, 0x47, 0x33, 0xae, - 0xe9, 0xa8, 0x9c, 0x0d, 0x35, 0x08, 0x61, 0x67, 0x5a, 0x0a, 0xec, 0x2b, 0xd8, 0x59, 0xd3, 0x65, - 0xc0, 0xa8, 0x16, 0xd2, 0x01, 0x2e, 0x18, 0x76, 0xc7, 0xc7, 0xd8, 0x68, 0x70, 0x19, 0x2b, 0x34, - 0xf8, 0xa1, 0x04, 0xbd, 0x2a, 0x63, 0xf7, 0x61, 0x57, 0xf2, 0x57, 0x2a, 0xd9, 0x13, 0x65, 0x4c, - 0x3a, 0x0d, 0x17, 0x0c, 0x3b, 0x1e, 0x34, 0xbf, 0xae, 0x19, 0x93, 0x83, 0x0f, 0x00, 0xff, 0xdf, - 0x98, 0xbe, 0x53, 0x4d, 0x35, 0xb7, 0x2f, 0x61, 0xdb, 0x9c, 0xba, 0xd8, 0xe7, 0xe2, 0x7d, 0xfd, - 0xf1, 0x7d, 0xce, 0x4d, 0x5a, 0xdb, 0xaf, 0xbe, 0xe5, 0x15, 0x29, 0xfb, 0x16, 0xc2, 0x0a, 0x74, - 0x9a, 0x6e, 0x73, 0xd8, 0x1d, 0x9f, 0xec, 0x77, 0xfc, 0x75, 0x2d, 0x34, 0xb5, 0xf0, 0x5d, 0xeb, - 0x5f, 0xe3, 0xa0, 0x39, 0xf1, 0xb6, 0x29, 0x02, 0xbb, 0x14, 0x81, 0xef, 0x14, 0x81, 0xf7, 0x0c, - 0x59, 0xbb, 0x0c, 0x59, 0x9f, 0x19, 0xb2, 0x1e, 0x2f, 0xfc, 0x40, 0x3f, 0xaf, 0x66, 0x78, 0x2e, - 0x42, 0xc2, 0x92, 0x90, 0x47, 0x2a, 0x10, 0xd1, 0x26, 0x79, 0xab, 0x86, 0x33, 0xc9, 0x16, 0x64, - 0x43, 0x6a, 0x2f, 0x92, 0x6f, 0x9d, 0xb5, 0xf3, 0xbb, 0x3e, 0xff, 0x09, 0x00, 0x00, 0xff, 0xff, - 0x2e, 0x89, 0x24, 0x98, 0xf6, 0x01, 0x00, 0x00, -} - -func (m *Sequencer) 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 *Sequencer) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *Sequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - if len(m.RewardAddr) > 0 { - i -= len(m.RewardAddr) - copy(dAtA[i:], m.RewardAddr) - i = encodeVarintGenesis(dAtA, i, uint64(len(m.RewardAddr))) - i-- - dAtA[i] = 0x12 - } - if m.Validator != nil { - { - size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenesis(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } - return len(dAtA) - i, nil + // 237 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x4e, 0x2d, 0x2c, + 0x4d, 0xcd, 0x4b, 0x4e, 0x2d, 0x2a, 0xd6, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x92, 0x28, 0xca, 0xcf, 0xc9, 0x49, 0x2c, 0x28, 0xd0, 0x43, 0xa8, + 0xd0, 0x2b, 0xa9, 0x2c, 0x48, 0x2d, 0x96, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0x2b, 0xd2, 0x07, + 0xb1, 0x20, 0xea, 0xa5, 0xa4, 0x91, 0x4c, 0x42, 0xd2, 0x02, 0x96, 0x54, 0x9a, 0xcf, 0xc8, 0xc5, + 0xe3, 0x0e, 0x31, 0x3e, 0xb8, 0x24, 0xb1, 0x24, 0x55, 0xc8, 0x8e, 0x8b, 0xad, 0x20, 0xb1, 0x28, + 0x31, 0xb7, 0x58, 0x82, 0x51, 0x81, 0x51, 0x83, 0xdb, 0x48, 0x41, 0x0f, 0x97, 0x75, 0x7a, 0x01, + 0x60, 0x75, 0x4e, 0x2c, 0x27, 0xee, 0xc9, 0x33, 0x04, 0x41, 0x75, 0x09, 0x79, 0x72, 0x71, 0x21, + 0x14, 0x4a, 0x30, 0x2b, 0x30, 0x6b, 0x70, 0x1b, 0x29, 0xe3, 0x36, 0x23, 0x18, 0x26, 0x00, 0x35, + 0x06, 0x49, 0xb3, 0x17, 0x0b, 0x07, 0x93, 0x00, 0xb3, 0x53, 0xd0, 0x89, 0x47, 0x72, 0x8c, 0x17, + 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, + 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x59, 0xa4, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, + 0xea, 0xa7, 0x54, 0xe6, 0xa6, 0xe6, 0x15, 0x67, 0xe6, 0xe7, 0x55, 0x54, 0x56, 0x21, 0x38, 0xba, + 0x45, 0x29, 0xd9, 0xfa, 0x15, 0x48, 0xbe, 0xd6, 0x07, 0xdb, 0x9a, 0xc4, 0x06, 0xf6, 0xbc, 0x31, + 0x20, 0x00, 0x00, 0xff, 0xff, 0xf8, 0xe7, 0x29, 0x35, 0x65, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -264,23 +160,6 @@ func encodeVarintGenesis(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *Sequencer) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - if m.Validator != nil { - l = m.Validator.Size() - n += 1 + l + sovGenesis(uint64(l)) - } - l = len(m.RewardAddr) - if l > 0 { - n += 1 + l + sovGenesis(uint64(l)) - } - return n -} - func (m *GenesisState) Size() (n int) { if m == nil { return 0 @@ -304,124 +183,6 @@ func sovGenesis(x uint64) (n int) { func sozGenesis(x uint64) (n int) { return sovGenesis(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *Sequencer) 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 ErrIntOverflowGenesis - } - 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: Sequencer: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Sequencer: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= int(b&0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthGenesis - } - postIndex := iNdEx + msglen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - if m.Validator == nil { - m.Validator = &types.Validator{} - } - if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenesis - } - 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 ErrInvalidLengthGenesis - } - postIndex := iNdEx + intStringLen - if postIndex < 0 { - return ErrInvalidLengthGenesis - } - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.RewardAddr = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipGenesis(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenesis - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *GenesisState) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/x/sequencers/types/helpers.go b/x/sequencers/types/helpers.go new file mode 100644 index 00000000..c1a49886 --- /dev/null +++ b/x/sequencers/types/helpers.go @@ -0,0 +1,16 @@ +package types + +import ( + "fmt" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/bech32" +) + +func Bech32ToAddr[T sdk.AccAddress | sdk.ValAddress](addr string) (T, error) { + _, bytes, err := bech32.DecodeAndConvert(addr) + if err != nil { + return nil, fmt.Errorf("decoding bech32 addr: %w", err) + } + return bytes, nil +} diff --git a/x/sequencers/types/helpers_test.go b/x/sequencers/types/helpers_test.go new file mode 100644 index 00000000..48089f9b --- /dev/null +++ b/x/sequencers/types/helpers_test.go @@ -0,0 +1,48 @@ +package types_test + +import ( + "testing" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/bech32" + "github.com/stretchr/testify/require" + + "github.com/dymensionxyz/dymension-rdk/testutil/utils" + "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" +) + +func TestBech32ToAddr(t *testing.T) { + testCases := []struct { + validPrefix string + }{ + {validPrefix: "cosmosvaloper"}, + {validPrefix: "dymval"}, + {validPrefix: "cosmos"}, + {validPrefix: "dym"}, + } + + for _, tc := range testCases { + t.Run(tc.validPrefix, func(t *testing.T) { + // generate an address with a random prefix + expectedBytes := utils.AccAddress().Bytes() + randomPrefixedAddr, err := bech32.ConvertAndEncode(tc.validPrefix, expectedBytes) + require.NoError(t, err) + + // convert the random-prefixed bech32 to the current val oper address + valOperAddr, err := types.Bech32ToAddr[sdk.ValAddress](randomPrefixedAddr) + require.NoError(t, err) + + // check results + // verify format + err = sdk.VerifyAddressFormat(valOperAddr) + require.NoError(t, err) + + // cast valOperAddr to string and verify the prefix and bytes + actualPrefix, actualBytes, err := bech32.DecodeAndConvert(valOperAddr.String()) + require.NoError(t, err) + expectedPrefix := sdk.GetConfig().GetBech32ValidatorAddrPrefix() + require.Equal(t, expectedPrefix, actualPrefix) + require.Equal(t, expectedBytes, actualBytes) + }) + } +} diff --git a/x/sequencers/types/keys.go b/x/sequencers/types/keys.go index 9b3d2ffa..be06b654 100644 --- a/x/sequencers/types/keys.go +++ b/x/sequencers/types/keys.go @@ -3,6 +3,7 @@ package types import ( "strconv" + "cosmossdk.io/collections" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" ) @@ -31,6 +32,7 @@ var ( SequencersByConsAddrKey = []byte{0x22} // prefix for each key to a sequencer index, by pubkey ValidatorUpdateKey = []byte{0x23} // prefix for each key to a validator updates list SequencersRewardAddrKey = []byte{0x24} // prefix for each key to a validator reward addr + WhitelistedRelayersKey = []byte{0x25} // prefix for each key to a validator whitelisted relayer list HistoricalInfoKey = []byte{0x50} // prefix for the historical info ) @@ -53,3 +55,7 @@ func GetSequencerRewardAddrKey(operator sdk.ValAddress) []byte { func GetHistoricalInfoKey(height int64) []byte { return append(HistoricalInfoKey, []byte(strconv.FormatInt(height, 10))...) } + +func WhitelistedRelayersPrefix() collections.Prefix { + return collections.NewPrefix(WhitelistedRelayersKey) +} diff --git a/x/sequencers/types/msgs.go b/x/sequencers/types/msgs.go index ad61605a..8f28b69c 100644 --- a/x/sequencers/types/msgs.go +++ b/x/sequencers/types/msgs.go @@ -2,7 +2,6 @@ package types import ( "errors" - "fmt" errorsmod "cosmossdk.io/errors" codectypes "github.com/cosmos/cosmos-sdk/codec/types" @@ -13,162 +12,139 @@ import ( ) var ( - _ sdk.Msg = (*MsgCreateSequencer)(nil) - _ sdk.Msg = (*MsgUpdateSequencer)(nil) - _ codectypes.UnpackInterfacesMessage = (*MsgCreateSequencer)(nil) + _ sdk.Msg = (*MsgUpdateRewardAddress)(nil) + _ sdk.Msg = (*MsgUpdateWhitelistedRelayers)(nil) + _ sdk.Msg = (*ConsensusMsgUpsertSequencer)(nil) + _ codectypes.UnpackInterfacesMessage = (*ConsensusMsgUpsertSequencer)(nil) ) -func (m *MsgCreateSequencer) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { - return unpacker.UnpackAny(m.PubKey, new(cryptotypes.PubKey)) -} - -func (m *MsgCreateSequencer) ValidateBasic() error { - if _, err := m.OperatorAccAddr(); err != nil { - return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "acc addr") - } - if m.GetPubKey() == nil { - return errors.New("pub key is nil") - } - if m.GetPubKey().GetCachedValue() == nil { - return errors.New("pub key cached value is nil") - } - v := stakingtypes.Validator{ - ConsensusPubkey: m.GetPubKey(), - } - tm, err := v.TmConsPublicKey() - if err != nil { - return errorsmod.Wrap(err, "tm cons pub key") - } - if tm.GetEd25519() == nil { - return errors.New("not ed5519") - } - operator, err := m.OperatorAddr() +func (m *MsgUpdateRewardAddress) ValidateBasic() error { + _, err := sdk.ValAddressFromBech32(m.GetOperator()) if err != nil { return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "acc addr") } - pubKey, _ := v.ConsPubKey() - - // We return OK only if the key and sig contains a key and signature where the signature was produced by the key, and the signature - // is over the operator account. - // - // The reasoning is as follows: - // - // We know from the SDK TX signing mechanism that the account originates from the operator, and on this chain ID. - // Therefore, we just need to check that the consensus private key also over this operator. Then we know that - // the private key holder of the operator and the consensus keys is the same actor. - if !pubKey.VerifySignature(operator, m.GetSignature()) { - return errorsmod.Wrap(gerrc.ErrUnauthenticated, "priv key of pub cons key was not used to sign operator addr") + _, err = sdk.AccAddressFromBech32(m.RewardAddr) + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "reward addr") } - return nil } -// Validator is a convenience method - it returns a validator object which already -// has implementations of various useful methods like obtaining various type conversions -// for the public key. -func (m *MsgCreateSequencer) Validator() stakingtypes.Validator { - return stakingtypes.Validator{ConsensusPubkey: m.PubKey, OperatorAddress: m.MustOperatorAddr().String()} +func (m *MsgUpdateRewardAddress) GetSigners() []sdk.AccAddress { + addr, _ := sdk.ValAddressFromBech32(m.Operator) + return []sdk.AccAddress{sdk.AccAddress(addr)} } -func (m *MsgCreateSequencer) GetSigners() []sdk.AccAddress { - return []sdk.AccAddress{m.MustAccAddr()} +func (m *MsgUpdateRewardAddress) MustOperatorAddr() sdk.ValAddress { + addr, err := sdk.ValAddressFromBech32(m.Operator) + if err != nil { + panic(err) + } + return addr } -func (m *MsgCreateSequencer) OperatorAccAddr() (sdk.AccAddress, error) { - operator, err := m.OperatorAddr() +func (m *MsgUpdateRewardAddress) MustRewardAcc() sdk.AccAddress { + ret, err := sdk.AccAddressFromBech32(m.RewardAddr) if err != nil { - return nil, errorsmod.Wrap(err, "operator addr") + panic(err) } - return sdk.AccAddress(operator), nil + return ret } -func (m *MsgCreateSequencer) MustAccAddr() sdk.AccAddress { - return sdk.AccAddress(m.MustOperatorAddr()) +func (m *MsgUpdateWhitelistedRelayers) ValidateBasic() error { + _, err := sdk.ValAddressFromBech32(m.GetOperator()) + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "acc addr") + } + err = WhitelistedRelayers{Relayers: m.Relayers}.Validate() + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "validate whitelisted relayer") + } + return nil } -func (m *MsgCreateSequencer) OperatorAddr() (sdk.ValAddress, error) { - return sdk.ValAddressFromBech32(m.GetOperator()) +func (m *MsgUpdateWhitelistedRelayers) GetSigners() []sdk.AccAddress { + addr, _ := sdk.ValAddressFromBech32(m.Operator) + return []sdk.AccAddress{sdk.AccAddress(addr)} } -func (m *MsgCreateSequencer) MustOperatorAddr() sdk.ValAddress { - addr, err := m.OperatorAddr() +func (m *MsgUpdateWhitelistedRelayers) MustOperatorAddr() sdk.ValAddress { + addr, err := sdk.ValAddressFromBech32(m.Operator) if err != nil { panic(err) } return addr } -func BuildMsgCreateSequencer( - // Produces a signature over a message - signer func(msg []byte) ([]byte, cryptotypes.PubKey, error), // implemented with a wrapper around keyring - // Operator, will be signed over by signer - operator sdk.ValAddress, -) (*MsgCreateSequencer, error) { - sig, pubKey, err := signer(operator) +func (m *ConsensusMsgUpsertSequencer) UnpackInterfaces(unpacker codectypes.AnyUnpacker) error { + return unpacker.UnpackAny(m.ConsPubKey, new(cryptotypes.PubKey)) +} + +func (m *ConsensusMsgUpsertSequencer) ValidateBasic() error { + operAddr, err := Bech32ToAddr[sdk.ValAddress](m.Operator) if err != nil { - return nil, fmt.Errorf("sign: %w", err) + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "get operator addr from bech32") } - if pubKey == nil { - return nil, errorsmod.Wrap(gerrc.ErrInvalidArgument, "signer returned nil pub key") - } - - pubKeyAny, err := codectypes.NewAnyWithValue(pubKey) + err = sdk.VerifyAddressFormat(operAddr) if err != nil { - return nil, errorsmod.Wrap(err, "pubkey to any") + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "validate bech32 operator addr") } - return &MsgCreateSequencer{ - Operator: operator.String(), - PubKey: pubKeyAny, - Signature: sig, - }, nil -} -func (m *MsgUpdateSequencer) ValidateBasic() error { - if _, err := m.OperatorAccAddr(); err != nil { - return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "acc addr") + if m.ConsPubKey == nil { + return errorsmod.Wrap(gerrc.ErrInvalidArgument, "pub key is nil") } - if _, err := m.RewardAcc(); err != nil { - return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "reward addr") + if m.ConsPubKey.GetCachedValue() == nil { + return errorsmod.Wrap(gerrc.ErrInvalidArgument, "pub key cached value is nil") } - return nil -} -func (m *MsgUpdateSequencer) GetSigners() []sdk.AccAddress { - return []sdk.AccAddress{m.MustAccAddr()} -} + rewardAddr, err := Bech32ToAddr[sdk.AccAddress](m.RewardAddr) + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "get reward addr from bech32") + } + err = sdk.VerifyAddressFormat(rewardAddr) + if err != nil { + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "validate bech32 reward addr") + } -func (m *MsgUpdateSequencer) OperatorAccAddr() (sdk.AccAddress, error) { - oper, err := m.OperatorAddr() + err = WhitelistedRelayers{Relayers: m.Relayers}.Validate() if err != nil { - return nil, errorsmod.Wrap(err, "operator addr") + return errorsmod.Wrap(errors.Join(gerrc.ErrInvalidArgument, err), "validate whitelisted relayer") } - return sdk.AccAddress(oper), nil -} -func (m *MsgUpdateSequencer) MustAccAddr() sdk.AccAddress { - return sdk.AccAddress(m.MustOperatorAddr()) + return nil } -func (m *MsgUpdateSequencer) OperatorAddr() (sdk.ValAddress, error) { - return sdk.ValAddressFromBech32(m.GetOperator()) +func (m *ConsensusMsgUpsertSequencer) GetSigners() []sdk.AccAddress { + addr, _ := sdk.ValAddressFromBech32(m.Operator) + return []sdk.AccAddress{sdk.AccAddress(addr)} } -func (m *MsgUpdateSequencer) MustOperatorAddr() sdk.ValAddress { - addr, err := m.OperatorAddr() +// MustValidator is a convenience method - it returns a validator object which already +// has implementations of various useful methods like obtaining various type conversions +// for the public key. +func (m *ConsensusMsgUpsertSequencer) MustValidator() stakingtypes.Validator { + valAddr, err := Bech32ToAddr[sdk.ValAddress](m.Operator) if err != nil { panic(err) } - return addr + return stakingtypes.Validator{ + ConsensusPubkey: m.ConsPubKey, + OperatorAddress: valAddr.String(), + } } -func (m *MsgUpdateSequencer) RewardAcc() (sdk.AccAddress, error) { - return sdk.AccAddressFromBech32(m.GetRewardAddr()) +func (m *ConsensusMsgUpsertSequencer) MustOperatorAddr() sdk.ValAddress { + operAddr, err := Bech32ToAddr[sdk.ValAddress](m.Operator) + if err != nil { + panic(err) + } + return operAddr } -func (m *MsgUpdateSequencer) MustRewardAcc() sdk.AccAddress { - ret, err := m.RewardAcc() +func (m *ConsensusMsgUpsertSequencer) MustRewardAddr() sdk.AccAddress { + rewardAddr, err := Bech32ToAddr[sdk.AccAddress](m.RewardAddr) if err != nil { panic(err) } - return ret + return rewardAddr } diff --git a/x/sequencers/types/msgs_test.go b/x/sequencers/types/msgs_test.go new file mode 100644 index 00000000..7266cb8f --- /dev/null +++ b/x/sequencers/types/msgs_test.go @@ -0,0 +1,84 @@ +package types_test + +import ( + "testing" + + codectypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" + "github.com/dymensionxyz/gerr-cosmos/gerrc" + "github.com/stretchr/testify/require" + + "github.com/dymensionxyz/dymension-rdk/testutil/utils" + "github.com/dymensionxyz/dymension-rdk/x/sequencers/types" +) + +func TestMsgVote(t *testing.T) { + valAddr := utils.AccAddress() + rewardAddr := utils.AccAddress() + anyPubKey, err := codectypes.NewAnyWithValue(ed25519.GenPrivKey().PubKey()) + require.NoError(t, err) + + tests := []struct { + name string + input types.ConsensusMsgUpsertSequencer + errorIs error + errorContains string + }{ + { + name: "valid", + input: types.ConsensusMsgUpsertSequencer{ + Operator: valAddr.String(), + ConsPubKey: anyPubKey, + RewardAddr: rewardAddr.String(), + }, + errorIs: nil, + errorContains: "", + }, + { + name: "empty cons pub key", + input: types.ConsensusMsgUpsertSequencer{ + Operator: valAddr.String(), + ConsPubKey: nil, + RewardAddr: rewardAddr.String(), + }, + errorIs: gerrc.ErrInvalidArgument, + errorContains: "pub key is nil", + }, + { + name: "invalid operator", + input: types.ConsensusMsgUpsertSequencer{ + Operator: "invalid_operator", + ConsPubKey: anyPubKey, + RewardAddr: rewardAddr.String(), + }, + errorIs: gerrc.ErrInvalidArgument, + errorContains: "get operator addr from bech32", + }, + { + name: "invalid reward addr", + input: types.ConsensusMsgUpsertSequencer{ + Operator: valAddr.String(), + ConsPubKey: anyPubKey, + RewardAddr: "invalid_reward_addr", + }, + errorIs: gerrc.ErrInvalidArgument, + errorContains: "get reward addr from bech32", + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + err := tt.input.ValidateBasic() + + expectError := tt.errorIs != nil + switch expectError { + case true: + require.Error(t, err) + require.ErrorIs(t, err, tt.errorIs) + require.Contains(t, err.Error(), tt.errorContains) + case false: + require.NoError(t, err) + } + }) + } +} diff --git a/x/sequencers/types/params.go b/x/sequencers/types/params.go index a22c6ff4..f4dc8440 100644 --- a/x/sequencers/types/params.go +++ b/x/sequencers/types/params.go @@ -1,8 +1,8 @@ package types import ( - fmt "fmt" - time "time" + "fmt" + "time" "github.com/cosmos/cosmos-sdk/codec" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" @@ -14,9 +14,9 @@ const ( // DefaultUnbondingTime reflects three weeks in seconds as the default // unbonding time. // TODO: Justify our choice of default here. - DefaultUnbondingTime time.Duration = time.Hour * 24 * 7 * 3 + DefaultUnbondingTime = time.Hour * 24 * 7 * 3 - // DefaultHistorical entries is 10000. Apps that don't use IBC can ignore this + // DefaultHistoricalEntries entries is 10000. Apps that don't use IBC can ignore this // value by not adding the staking module to the application module manager's // SetOrderBeginBlockers. DefaultHistoricalEntries uint32 = 10000 @@ -34,7 +34,7 @@ func ParamKeyTable() paramtypes.KeyTable { return paramtypes.NewKeyTable().RegisterParamSet(&Params{}) } -// Implements params.ParamSet +// ParamSetPairs implements params.ParamSet func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs { return paramtypes.ParamSetPairs{ paramtypes.NewParamSetPair(KeyUnbondingTime, &p.UnbondingTime, validateUnbondingTime), @@ -56,7 +56,7 @@ func (p Params) String() string { return string(out) } -// unmarshal the current staking params value from store key or panic +// MustUnmarshalParams unmarshals the current staking params value from store key or panic func MustUnmarshalParams(cdc *codec.LegacyAmino, value []byte) Params { params, err := UnmarshalParams(cdc, value) if err != nil { @@ -66,7 +66,7 @@ func MustUnmarshalParams(cdc *codec.LegacyAmino, value []byte) Params { return params } -// unmarshal the current staking params value from store key +// UnmarshalParams unmarshals the current staking params value from store key func UnmarshalParams(cdc *codec.LegacyAmino, value []byte) (params Params, err error) { err = cdc.Unmarshal(value, ¶ms) if err != nil { @@ -76,7 +76,7 @@ func UnmarshalParams(cdc *codec.LegacyAmino, value []byte) (params Params, err e return } -// validate a set of params +// Validate a set of params func (p Params) Validate() error { if err := validateUnbondingTime(p.UnbondingTime); err != nil { return err diff --git a/x/sequencers/types/query.pb.go b/x/sequencers/types/query.pb.go index b6776fac..5ccee4b8 100644 --- a/x/sequencers/types/query.pb.go +++ b/x/sequencers/types/query.pb.go @@ -33,9 +33,9 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // QuerySequencersRequest is request type for Query/Sequencers RPC method. type QuerySequencersRequest struct { - // status enables to query for sequencers matching a given status. + // Status enables to query for sequencers matching a given status. Status string `protobuf:"bytes,1,opt,name=status,proto3" json:"status,omitempty"` - // pagination defines an optional pagination for the request. + // Pagination defines an optional pagination for the request. Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -88,9 +88,9 @@ func (m *QuerySequencersRequest) GetPagination() *query.PageRequest { // QuerySequencersResponse is response type for the Query/Sequencers RPC method type QuerySequencersResponse struct { - // sequencers contains all the queried sequencers. + // Sequencers contains all the queried sequencers. Sequencers []types.Validator `protobuf:"bytes,1,rep,name=sequencers,proto3" json:"sequencers"` - // pagination defines the pagination in the response. + // Pagination defines the pagination in the response. Pagination *query.PageResponse `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"` } @@ -143,7 +143,7 @@ func (m *QuerySequencersResponse) GetPagination() *query.PageResponse { // QuerySequencerRequest is response type for the Query/Sequencer RPC method type QuerySequencerRequest struct { - // sequencer_addr defines the sequencer address to query for. + // SequencerAddr defines the sequencer address to query for. SequencerAddr string `protobuf:"bytes,1,opt,name=sequencer_addr,json=sequencerAddr,proto3" json:"sequencer_addr,omitempty"` } @@ -189,7 +189,7 @@ func (m *QuerySequencerRequest) GetSequencerAddr() string { // QuerySequencerResponse is response type for the Query/Sequencer RPC method type QuerySequencerResponse struct { - // sequencer defines the the sequencer info. + // Sequencer defines the the sequencer info. Sequencer types.Validator `protobuf:"bytes,1,opt,name=sequencer,proto3" json:"sequencer"` } @@ -236,7 +236,7 @@ func (m *QuerySequencerResponse) GetSequencer() types.Validator { // QueryHistoricalInfoRequest is request type for the Query/HistoricalInfo RPC // method. type QueryHistoricalInfoRequest struct { - // height defines at which height to query the historical info. + // Height defines at which height to query the historical info. Height int64 `protobuf:"varint,1,opt,name=height,proto3" json:"height,omitempty"` } @@ -283,7 +283,7 @@ func (m *QueryHistoricalInfoRequest) GetHeight() int64 { // QueryHistoricalInfoResponse is response type for the Query/HistoricalInfo RPC // method. type QueryHistoricalInfoResponse struct { - // hist defines the historical info at the given height. + // Hist defines the historical info at the given height. Hist *types.HistoricalInfo `protobuf:"bytes,1,opt,name=hist,proto3" json:"hist,omitempty"` } @@ -366,7 +366,7 @@ var xxx_messageInfo_QueryParamsRequest proto.InternalMessageInfo // QueryParamsResponse is response type for the Query/Params RPC method. type QueryParamsResponse struct { - // params holds all the parameters of this module. + // Params holds all the parameters of this module. Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` } @@ -425,46 +425,46 @@ func init() { proto.RegisterFile("sequencers/query.proto", fileDescriptor_1707b8 var fileDescriptor_1707b8f76abec2d9 = []byte{ // 641 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcd, 0x6e, 0xd3, 0x4e, - 0x14, 0xc5, 0x33, 0xfd, 0x88, 0xd4, 0xa9, 0xfe, 0x5d, 0xcc, 0xbf, 0xb4, 0x91, 0x41, 0x26, 0x58, - 0x10, 0x22, 0x44, 0xed, 0x36, 0x14, 0x09, 0xb1, 0x28, 0x6a, 0x04, 0x14, 0x58, 0x15, 0x23, 0x90, - 0x60, 0x13, 0x4d, 0xe2, 0xa9, 0x33, 0x6a, 0xe2, 0x71, 0x3d, 0x13, 0x94, 0x50, 0x75, 0xc3, 0x1e, - 0x09, 0x89, 0x27, 0x60, 0xcd, 0x1b, 0xb0, 0x63, 0x83, 0xba, 0xac, 0xc4, 0x86, 0x15, 0x42, 0x09, - 0x0f, 0x82, 0x32, 0x1e, 0x7f, 0xb5, 0x09, 0x49, 0x76, 0x9e, 0xcc, 0x3d, 0xe7, 0xfe, 0xee, 0xf5, - 0x89, 0xe1, 0x1a, 0x27, 0x47, 0x1d, 0xe2, 0x35, 0x48, 0xc0, 0xad, 0xa3, 0x0e, 0x09, 0x7a, 0xa6, - 0x1f, 0x30, 0xc1, 0x50, 0x21, 0x60, 0xad, 0x16, 0xf6, 0x7d, 0x33, 0xb9, 0x37, 0x45, 0xcf, 0x27, - 0x5c, 0x5b, 0x75, 0x99, 0xcb, 0x64, 0x91, 0x35, 0x7c, 0x0a, 0xeb, 0xb5, 0xeb, 0x0d, 0xc6, 0xdb, - 0x8c, 0x5b, 0x5c, 0xe0, 0x43, 0xea, 0xb9, 0xd6, 0xdb, 0xad, 0x3a, 0x11, 0x78, 0x2b, 0x3a, 0xab, - 0xaa, 0x2b, 0x2e, 0x63, 0x6e, 0x8b, 0x58, 0xd8, 0xa7, 0x16, 0xf6, 0x3c, 0x26, 0xb0, 0xa0, 0xcc, - 0xe3, 0xea, 0xf6, 0x96, 0xf2, 0xa8, 0x63, 0x4e, 0x42, 0x98, 0xd8, 0xc6, 0xc7, 0x2e, 0xf5, 0x64, - 0xb1, 0xaa, 0x5d, 0x4f, 0x71, 0xfb, 0x38, 0xc0, 0x6d, 0x65, 0x62, 0x74, 0xe1, 0xda, 0xf3, 0xa1, - 0xf4, 0x45, 0x7c, 0x6f, 0x0f, 0x9f, 0xb8, 0x40, 0x6b, 0x30, 0xcf, 0x05, 0x16, 0x1d, 0x5e, 0x00, - 0x45, 0x50, 0x5e, 0xb2, 0xd5, 0x09, 0x3d, 0x86, 0x30, 0xb1, 0x2f, 0xcc, 0x15, 0x41, 0x79, 0xb9, - 0x52, 0x32, 0x43, 0x16, 0x73, 0xc8, 0x62, 0x86, 0x8b, 0x51, 0x2c, 0xe6, 0x3e, 0x76, 0x89, 0xf2, - 0xb4, 0x53, 0x4a, 0xe3, 0x0b, 0x80, 0xeb, 0x17, 0x5a, 0x73, 0x9f, 0x79, 0x9c, 0xa0, 0x3d, 0x08, - 0x13, 0xe0, 0x02, 0x28, 0xce, 0x97, 0x97, 0x2b, 0xd7, 0xa2, 0x1e, 0xd1, 0x8e, 0xa2, 0x06, 0xaf, - 0x70, 0x8b, 0x3a, 0x58, 0xb0, 0xa0, 0xba, 0x70, 0xfa, 0xeb, 0x6a, 0xce, 0x4e, 0x49, 0x87, 0x46, - 0x17, 0x60, 0x6f, 0x4e, 0x84, 0x0d, 0x29, 0x32, 0xb4, 0x3b, 0xf0, 0x52, 0x16, 0x36, 0x5a, 0xd3, - 0x0d, 0xb8, 0x12, 0xf7, 0xab, 0x61, 0xc7, 0x09, 0xd4, 0xba, 0xfe, 0x8b, 0x7f, 0xdd, 0x75, 0x9c, - 0xc0, 0xa8, 0x9d, 0xdf, 0x73, 0x3c, 0xeb, 0x23, 0xb8, 0x14, 0x97, 0x4a, 0xed, 0x0c, 0xa3, 0x26, - 0x4a, 0x63, 0x1b, 0x6a, 0xb2, 0xc1, 0x13, 0xca, 0x05, 0x0b, 0x68, 0x03, 0xb7, 0x9e, 0x7a, 0x07, - 0x2c, 0xf5, 0x32, 0x9b, 0x84, 0xba, 0x4d, 0x21, 0x3b, 0xcc, 0xdb, 0xea, 0x64, 0xbc, 0x86, 0x97, - 0x47, 0xaa, 0x14, 0xdb, 0x7d, 0xb8, 0xd0, 0xa4, 0x5c, 0x28, 0xac, 0xd2, 0x38, 0xac, 0x73, 0x6a, - 0xa9, 0x31, 0x56, 0x21, 0x92, 0xd6, 0xfb, 0x32, 0x6e, 0x0a, 0xc4, 0x78, 0x09, 0xff, 0xcf, 0xfc, - 0xaa, 0x1a, 0xed, 0xc0, 0x7c, 0x18, 0x4b, 0xd5, 0xaa, 0x68, 0x8e, 0xfb, 0x43, 0x99, 0xa1, 0x52, - 0x2d, 0x40, 0xa9, 0x2a, 0xdf, 0x16, 0xe1, 0xa2, 0xf4, 0x45, 0x9f, 0x01, 0x84, 0x49, 0xa2, 0xd0, - 0xe6, 0x78, 0xa3, 0xd1, 0xb9, 0xd7, 0xb6, 0x66, 0x50, 0x84, 0xf4, 0x86, 0xf9, 0xfe, 0xc7, 0x9f, - 0x4f, 0x73, 0x65, 0x54, 0xb2, 0x9c, 0x5e, 0x9b, 0x78, 0x9c, 0x32, 0xaf, 0xdb, 0x7b, 0x97, 0x1c, - 0x36, 0x02, 0xe7, 0xd0, 0x4a, 0xa5, 0xf2, 0x2b, 0x80, 0x4b, 0xb1, 0x0d, 0xb2, 0xa6, 0x6d, 0x18, - 0x11, 0x6e, 0x4e, 0x2f, 0x50, 0x80, 0xcf, 0x24, 0xe0, 0x43, 0x54, 0x9d, 0x0e, 0x30, 0xfd, 0x78, - 0x9c, 0x4d, 0xf7, 0x09, 0xfa, 0x0e, 0xe0, 0x4a, 0xf6, 0x85, 0xa3, 0xed, 0x09, 0x40, 0x23, 0x33, - 0xa9, 0xdd, 0x9d, 0x51, 0xa5, 0x66, 0xd9, 0x93, 0xb3, 0xec, 0xa2, 0x07, 0x53, 0xce, 0xd2, 0x8c, - 0x6d, 0x6a, 0xd4, 0x3b, 0x60, 0xd6, 0x71, 0x18, 0xfd, 0x13, 0xf4, 0x01, 0xc0, 0x7c, 0x18, 0x26, - 0x74, 0x7b, 0x02, 0x4a, 0x26, 0xc3, 0xda, 0xc6, 0x94, 0xd5, 0x0a, 0xb8, 0x24, 0x81, 0x8b, 0x48, - 0xb7, 0xc6, 0x7c, 0xf4, 0xc3, 0x0c, 0x57, 0xed, 0xd3, 0xbe, 0x0e, 0xce, 0xfa, 0x3a, 0xf8, 0xdd, - 0xd7, 0xc1, 0xc7, 0x81, 0x9e, 0x3b, 0x1b, 0xe8, 0xb9, 0x9f, 0x03, 0x3d, 0xf7, 0xe6, 0x9e, 0x4b, - 0x45, 0xb3, 0x53, 0x37, 0x1b, 0xac, 0xfd, 0xaf, 0xa1, 0xbb, 0xe9, 0xb1, 0x25, 0x4f, 0x3d, 0x2f, - 0xbf, 0xf2, 0x77, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x63, 0x6a, 0xc8, 0xb0, 0xb8, 0x06, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xcb, 0x6e, 0xd3, 0x4c, + 0x14, 0xc7, 0x33, 0xbd, 0x44, 0xea, 0x54, 0x5f, 0x17, 0xf3, 0x95, 0x12, 0xb9, 0xc8, 0x04, 0x0b, + 0x42, 0x84, 0xa8, 0xdd, 0x86, 0x22, 0x21, 0x16, 0x45, 0x8d, 0x80, 0x02, 0xab, 0x62, 0x04, 0x12, + 0x6c, 0xa2, 0x49, 0x3c, 0x75, 0x46, 0x4d, 0x3c, 0xae, 0x67, 0x82, 0x12, 0xaa, 0x6e, 0xd8, 0x23, + 0x21, 0xf1, 0x04, 0xac, 0x79, 0x03, 0x76, 0x6c, 0x50, 0x97, 0x95, 0xd8, 0xb0, 0x42, 0x28, 0xe1, + 0x41, 0x50, 0xc6, 0xe3, 0x5b, 0x9b, 0x90, 0x64, 0x37, 0x97, 0xf3, 0x3f, 0xff, 0xdf, 0x39, 0x3e, + 0x1e, 0xb8, 0xc6, 0xc9, 0x51, 0x87, 0x78, 0x0d, 0x12, 0x70, 0xeb, 0xa8, 0x43, 0x82, 0x9e, 0xe9, + 0x07, 0x4c, 0x30, 0x54, 0x08, 0x58, 0xab, 0x85, 0x7d, 0xdf, 0x4c, 0xee, 0x4d, 0xd1, 0xf3, 0x09, + 0xd7, 0x56, 0x5d, 0xe6, 0x32, 0x19, 0x64, 0x0d, 0x57, 0x61, 0xbc, 0x76, 0xbd, 0xc1, 0x78, 0x9b, + 0x71, 0x8b, 0x0b, 0x7c, 0x48, 0x3d, 0xd7, 0x7a, 0xbb, 0x55, 0x27, 0x02, 0x6f, 0x45, 0x7b, 0x15, + 0x75, 0xc5, 0x65, 0xcc, 0x6d, 0x11, 0x0b, 0xfb, 0xd4, 0xc2, 0x9e, 0xc7, 0x04, 0x16, 0x94, 0x79, + 0x5c, 0xdd, 0xde, 0x52, 0x39, 0xea, 0x98, 0x93, 0x10, 0x26, 0x4e, 0xe3, 0x63, 0x97, 0x7a, 0x32, + 0x58, 0xc5, 0xae, 0xa7, 0xb8, 0x53, 0x88, 0xf2, 0xd2, 0xe8, 0xc2, 0xb5, 0xe7, 0x43, 0xf9, 0x8b, + 0xf8, 0xc2, 0x1e, 0xae, 0xb8, 0x40, 0x6b, 0x30, 0xcf, 0x05, 0x16, 0x1d, 0x5e, 0x00, 0x45, 0x50, + 0x5e, 0xb2, 0xd5, 0x0e, 0x3d, 0x86, 0x30, 0xb1, 0x28, 0xcc, 0x15, 0x41, 0x79, 0xb9, 0x52, 0x32, + 0x43, 0x1e, 0x73, 0xc8, 0x63, 0x86, 0xcd, 0x51, 0x3c, 0xe6, 0x3e, 0x76, 0x89, 0xca, 0x69, 0xa7, + 0x94, 0xc6, 0x17, 0x00, 0x2f, 0x5f, 0xb0, 0xe6, 0x3e, 0xf3, 0x38, 0x41, 0x7b, 0x10, 0x26, 0xa4, + 0x05, 0x50, 0x9c, 0x2f, 0x2f, 0x57, 0xae, 0x45, 0x1e, 0x51, 0x9f, 0x22, 0x83, 0x57, 0xb8, 0x45, + 0x1d, 0x2c, 0x58, 0x50, 0x5d, 0x38, 0xfd, 0x75, 0x35, 0x67, 0xa7, 0xa4, 0xc3, 0x44, 0x17, 0x60, + 0x6f, 0x4e, 0x84, 0x0d, 0x29, 0x32, 0xb4, 0x3b, 0xf0, 0x52, 0x16, 0x36, 0x6a, 0xd3, 0x0d, 0xb8, + 0x12, 0xfb, 0xd5, 0xb0, 0xe3, 0x04, 0xaa, 0x5d, 0xff, 0xc5, 0xa7, 0xbb, 0x8e, 0x13, 0x18, 0xb5, + 0xf3, 0x7d, 0x8e, 0x6b, 0x7d, 0x04, 0x97, 0xe2, 0x50, 0xa9, 0x9d, 0xa1, 0xd4, 0x44, 0x69, 0x6c, + 0x43, 0x4d, 0x1a, 0x3c, 0xa1, 0x5c, 0xb0, 0x80, 0x36, 0x70, 0xeb, 0xa9, 0x77, 0xc0, 0x52, 0x1f, + 0xb3, 0x49, 0xa8, 0xdb, 0x14, 0xd2, 0x61, 0xde, 0x56, 0x3b, 0xe3, 0x35, 0x5c, 0x1f, 0xa9, 0x52, + 0x6c, 0xf7, 0xe1, 0x42, 0x93, 0x72, 0xa1, 0xb0, 0x4a, 0xe3, 0xb0, 0xce, 0xa9, 0xa5, 0xc6, 0x58, + 0x85, 0x48, 0xa6, 0xde, 0xc7, 0x01, 0x6e, 0x47, 0x53, 0x65, 0xbc, 0x84, 0xff, 0x67, 0x4e, 0x95, + 0xd1, 0x0e, 0xcc, 0xfb, 0xf2, 0x44, 0x59, 0x15, 0xcd, 0x71, 0x3f, 0x95, 0x19, 0x2a, 0x55, 0x03, + 0x94, 0xaa, 0xf2, 0x6d, 0x11, 0x2e, 0xca, 0xbc, 0xe8, 0x33, 0x80, 0x30, 0x99, 0x28, 0xb4, 0x39, + 0x3e, 0xd1, 0xe8, 0xb9, 0xd7, 0xb6, 0x66, 0x50, 0x84, 0xf4, 0x86, 0xf9, 0xfe, 0xc7, 0x9f, 0x4f, + 0x73, 0x65, 0x54, 0xb2, 0x9c, 0x5e, 0x9b, 0x78, 0x9c, 0x32, 0xaf, 0xdb, 0x7b, 0x97, 0x6c, 0x36, + 0x02, 0xe7, 0x30, 0xf5, 0xeb, 0xa1, 0xaf, 0x00, 0x2e, 0xc5, 0x69, 0x90, 0x35, 0xad, 0x61, 0x44, + 0xb8, 0x39, 0xbd, 0x40, 0x01, 0x3e, 0x93, 0x80, 0x0f, 0x51, 0x75, 0x3a, 0xc0, 0xf4, 0xf2, 0x38, + 0x3b, 0xdd, 0x27, 0xe8, 0x3b, 0x80, 0x2b, 0xd9, 0x0f, 0x8e, 0xb6, 0x27, 0x00, 0x8d, 0x9c, 0x49, + 0xed, 0xee, 0x8c, 0x2a, 0x55, 0xcb, 0x9e, 0xac, 0x65, 0x17, 0x3d, 0x98, 0xb2, 0x96, 0x66, 0x9c, + 0xa6, 0x46, 0xbd, 0x03, 0x66, 0x1d, 0x87, 0xa3, 0x7f, 0x82, 0x3e, 0x00, 0x98, 0x0f, 0x87, 0x09, + 0xdd, 0x9e, 0x80, 0x92, 0x99, 0x61, 0x6d, 0x63, 0xca, 0x68, 0x05, 0x5c, 0x92, 0xc0, 0x45, 0xa4, + 0x5b, 0x63, 0x1e, 0xfe, 0x70, 0x86, 0xab, 0xf6, 0x69, 0x5f, 0x07, 0x67, 0x7d, 0x1d, 0xfc, 0xee, + 0xeb, 0xe0, 0xe3, 0x40, 0xcf, 0x9d, 0x0d, 0xf4, 0xdc, 0xcf, 0x81, 0x9e, 0x7b, 0x73, 0xcf, 0xa5, + 0xa2, 0xd9, 0xa9, 0x9b, 0x0d, 0xd6, 0xfe, 0x57, 0xd1, 0xdd, 0x74, 0xd9, 0x92, 0xa7, 0x9e, 0x97, + 0xaf, 0xfc, 0x9d, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x56, 0xd1, 0xb2, 0xbc, 0x06, 0x00, 0x00, } diff --git a/x/sequencers/types/sequencer.go b/x/sequencers/types/sequencer.go deleted file mode 100644 index 7b7e767b..00000000 --- a/x/sequencers/types/sequencer.go +++ /dev/null @@ -1,20 +0,0 @@ -package types - -import ( - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - sdk "github.com/cosmos/cosmos-sdk/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" -) - -/* ---------------------------------- UTILS --------------------------------- */ -func NewSequencer(operator sdk.ValAddress, pubKey cryptotypes.PubKey, power int64) (stakingtypes.Validator, error) { - val, err := stakingtypes.NewValidator(operator, pubKey, stakingtypes.Description{}) - if err != nil { - return stakingtypes.Validator{}, err - } - if power > 0 { - val.Status = stakingtypes.Bonded - val.Tokens = sdk.TokensFromConsensusPower(power, sdk.DefaultPowerReduction) - } - return val, nil -} diff --git a/x/sequencers/types/sequencers.go b/x/sequencers/types/sequencers.go new file mode 100644 index 00000000..bf41072d --- /dev/null +++ b/x/sequencers/types/sequencers.go @@ -0,0 +1,41 @@ +package types + +import ( + "fmt" + "slices" + + sdk "github.com/cosmos/cosmos-sdk/types" +) + +func MustNewWhitelistedRelayers(relayers []string) WhitelistedRelayers { + convertedRelayers := make([]string, 0, len(relayers)) + for _, r := range relayers { + relayer, err := Bech32ToAddr[sdk.AccAddress](r) + if err != nil { + panic(fmt.Errorf("convert bech32 to relayer address: %s: %w", r, err)) + } + convertedRelayers = append(convertedRelayers, relayer.String()) + } + slices.Sort(convertedRelayers) + return WhitelistedRelayers{Relayers: convertedRelayers} +} + +func (wr WhitelistedRelayers) Validate() error { + relayers := make(map[string]struct{}, len(r.Relayers)) + for _, r := range wr.Relayers { + if _, ok := relayers[r]; ok { + return fmt.Errorf("duplicated relayer: %s", r) + } + relayers[r] = struct{}{} + + relayer, err := Bech32ToAddr[sdk.AccAddress](r) + if err != nil { + return fmt.Errorf("convert bech32 to relayer address: %s: %w", r, err) + } + err = sdk.VerifyAddressFormat(relayer) + if err != nil { + return fmt.Errorf("invalid relayer address: %s: %w", r, err) + } + } + return nil +} diff --git a/x/sequencers/types/sequencers.pb.go b/x/sequencers/types/sequencers.pb.go new file mode 100644 index 00000000..516dfacc --- /dev/null +++ b/x/sequencers/types/sequencers.pb.go @@ -0,0 +1,865 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: sequencers/sequencers.proto + +package types + +import ( + fmt "fmt" + types1 "github.com/cosmos/cosmos-sdk/x/staking/types" + _ "github.com/gogo/protobuf/gogoproto" + proto "github.com/gogo/protobuf/proto" + _ "github.com/gogo/protobuf/types" + github_com_gogo_protobuf_types "github.com/gogo/protobuf/types" + io "io" + math "math" + math_bits "math/bits" + time "time" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf +var _ = time.Kitchen + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package + +// Params defines the parameters for the module. +type Params struct { + // UnbondingTime is the time duration of unbonding. + UnbondingTime time.Duration `protobuf:"bytes,1,opt,name=unbonding_time,json=unbondingTime,proto3,stdduration" json:"unbonding_time" yaml:"unbonding_time"` + // HistoricalEntries is the number of historical entries to persist. + HistoricalEntries uint32 `protobuf:"varint,2,opt,name=historical_entries,json=historicalEntries,proto3" json:"historical_entries,omitempty" yaml:"historical_entries"` +} + +func (m *Params) Reset() { *m = Params{} } +func (*Params) ProtoMessage() {} +func (*Params) Descriptor() ([]byte, []int) { + return fileDescriptor_632cf56d50d4d0f1, []int{0} +} +func (m *Params) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Params) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Params.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 *Params) XXX_Merge(src proto.Message) { + xxx_messageInfo_Params.Merge(m, src) +} +func (m *Params) XXX_Size() int { + return m.Size() +} +func (m *Params) XXX_DiscardUnknown() { + xxx_messageInfo_Params.DiscardUnknown(m) +} + +var xxx_messageInfo_Params proto.InternalMessageInfo + +func (m *Params) GetUnbondingTime() time.Duration { + if m != nil { + return m.UnbondingTime + } + return 0 +} + +func (m *Params) GetHistoricalEntries() uint32 { + if m != nil { + return m.HistoricalEntries + } + return 0 +} + +type Sequencer struct { + // Validator is a convenient storage for e.g operator address and consensus pub key + Validator *types1.Validator `protobuf:"bytes,1,opt,name=validator,proto3" json:"validator,omitempty"` + // RewardAddr is the sdk acc address where the sequencer has opted to receive rewards. Empty if not set. + RewardAddr string `protobuf:"bytes,2,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,3,rep,name=relayers,proto3" json:"relayers,omitempty"` +} + +func (m *Sequencer) Reset() { *m = Sequencer{} } +func (m *Sequencer) String() string { return proto.CompactTextString(m) } +func (*Sequencer) ProtoMessage() {} +func (*Sequencer) Descriptor() ([]byte, []int) { + return fileDescriptor_632cf56d50d4d0f1, []int{1} +} +func (m *Sequencer) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *Sequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_Sequencer.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 *Sequencer) XXX_Merge(src proto.Message) { + xxx_messageInfo_Sequencer.Merge(m, src) +} +func (m *Sequencer) XXX_Size() int { + return m.Size() +} +func (m *Sequencer) XXX_DiscardUnknown() { + xxx_messageInfo_Sequencer.DiscardUnknown(m) +} + +var xxx_messageInfo_Sequencer proto.InternalMessageInfo + +func (m *Sequencer) GetValidator() *types1.Validator { + if m != nil { + return m.Validator + } + return nil +} + +func (m *Sequencer) GetRewardAddr() string { + if m != nil { + return m.RewardAddr + } + return "" +} + +func (m *Sequencer) GetRelayers() []string { + if m != nil { + return m.Relayers + } + return nil +} + +// WhitelistedRelayers is used for storing the whitelisted relater list in the state +type WhitelistedRelayers struct { + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,1,rep,name=relayers,proto3" json:"relayers,omitempty"` +} + +func (m *WhitelistedRelayers) Reset() { *m = WhitelistedRelayers{} } +func (m *WhitelistedRelayers) String() string { return proto.CompactTextString(m) } +func (*WhitelistedRelayers) ProtoMessage() {} +func (*WhitelistedRelayers) Descriptor() ([]byte, []int) { + return fileDescriptor_632cf56d50d4d0f1, []int{2} +} +func (m *WhitelistedRelayers) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *WhitelistedRelayers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_WhitelistedRelayers.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 *WhitelistedRelayers) XXX_Merge(src proto.Message) { + xxx_messageInfo_WhitelistedRelayers.Merge(m, src) +} +func (m *WhitelistedRelayers) XXX_Size() int { + return m.Size() +} +func (m *WhitelistedRelayers) XXX_DiscardUnknown() { + xxx_messageInfo_WhitelistedRelayers.DiscardUnknown(m) +} + +var xxx_messageInfo_WhitelistedRelayers proto.InternalMessageInfo + +func (m *WhitelistedRelayers) GetRelayers() []string { + if m != nil { + return m.Relayers + } + return nil +} + +func init() { + proto.RegisterType((*Params)(nil), "rollapp.sequencers.types.Params") + proto.RegisterType((*Sequencer)(nil), "rollapp.sequencers.types.Sequencer") + proto.RegisterType((*WhitelistedRelayers)(nil), "rollapp.sequencers.types.WhitelistedRelayers") +} + +func init() { proto.RegisterFile("sequencers/sequencers.proto", fileDescriptor_632cf56d50d4d0f1) } + +var fileDescriptor_632cf56d50d4d0f1 = []byte{ + // 426 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x52, 0x3d, 0x6f, 0xd4, 0x40, + 0x10, 0xf5, 0x12, 0x29, 0xca, 0x6d, 0x14, 0x24, 0x0c, 0x48, 0x97, 0x43, 0xd8, 0x17, 0x8b, 0xe2, + 0x1a, 0x76, 0x75, 0xd0, 0xa0, 0x34, 0x88, 0x13, 0x74, 0x14, 0xc8, 0x20, 0x90, 0x68, 0x4e, 0x6b, + 0xef, 0xe0, 0x5b, 0x65, 0xbd, 0x6b, 0x76, 0xd7, 0x21, 0xe6, 0x1f, 0xd0, 0x51, 0xa6, 0xcc, 0x9f, + 0x41, 0x4a, 0x99, 0x92, 0xea, 0x40, 0x77, 0x0d, 0x75, 0x7e, 0x01, 0xc2, 0x1f, 0xf1, 0x9d, 0xe8, + 0xe6, 0xbd, 0x79, 0xcf, 0xe3, 0x79, 0x3b, 0xf8, 0x81, 0x85, 0xcf, 0x25, 0xa8, 0x14, 0x8c, 0xa5, + 0x7d, 0x49, 0x0a, 0xa3, 0x9d, 0xf6, 0x87, 0x46, 0x4b, 0xc9, 0x8a, 0x82, 0x6c, 0x74, 0x5c, 0x55, + 0x80, 0x1d, 0xdd, 0xcb, 0x74, 0xa6, 0x6b, 0x11, 0xfd, 0x57, 0x35, 0xfa, 0x51, 0x90, 0x69, 0x9d, + 0x49, 0xa0, 0x35, 0x4a, 0xca, 0x4f, 0x94, 0x97, 0x86, 0x39, 0xa1, 0x55, 0xdb, 0x7f, 0x94, 0x6a, + 0x9b, 0x6b, 0x4b, 0xad, 0x63, 0x27, 0x42, 0x65, 0xf4, 0x74, 0x9a, 0x80, 0x63, 0xd3, 0x0e, 0x37, + 0xaa, 0xe8, 0x07, 0xc2, 0xbb, 0x6f, 0x98, 0x61, 0xb9, 0xf5, 0x53, 0x7c, 0xbb, 0x54, 0x89, 0x56, + 0x5c, 0xa8, 0x6c, 0xee, 0x44, 0x0e, 0x43, 0x34, 0x46, 0x93, 0xfd, 0x27, 0x87, 0xa4, 0x99, 0x44, + 0xba, 0x49, 0xe4, 0x65, 0x3b, 0x69, 0x76, 0x74, 0xb9, 0x0c, 0xbd, 0xeb, 0x65, 0x78, 0xbf, 0x62, + 0xb9, 0x3c, 0x8e, 0xb6, 0xed, 0xd1, 0xf9, 0xaf, 0x10, 0xc5, 0x07, 0x37, 0xe4, 0x3b, 0x91, 0x83, + 0xff, 0x1a, 0xfb, 0x0b, 0x61, 0x9d, 0x36, 0x22, 0x65, 0x72, 0x0e, 0xca, 0x19, 0x01, 0x76, 0x78, + 0x6b, 0x8c, 0x26, 0x07, 0xb3, 0x87, 0xd7, 0xcb, 0xf0, 0xb0, 0xf9, 0xd2, 0xff, 0x9a, 0x28, 0xbe, + 0xd3, 0x93, 0xaf, 0x1a, 0xee, 0x78, 0xef, 0xfc, 0x22, 0xf4, 0xfe, 0x5c, 0x84, 0x28, 0xfa, 0x86, + 0xf0, 0xe0, 0x6d, 0x17, 0x9c, 0xff, 0x1c, 0x0f, 0x4e, 0x99, 0x14, 0x9c, 0x39, 0x6d, 0xda, 0x2d, + 0x8e, 0x48, 0x93, 0x07, 0xe9, 0xf6, 0x6f, 0xf3, 0x20, 0xef, 0x3b, 0x61, 0xdc, 0x7b, 0xfc, 0x10, + 0xef, 0x1b, 0xf8, 0xc2, 0x0c, 0x9f, 0x33, 0xce, 0x4d, 0xfd, 0x7f, 0x83, 0x18, 0x37, 0xd4, 0x0b, + 0xce, 0x8d, 0x3f, 0xc2, 0x7b, 0x06, 0x24, 0xab, 0xc0, 0xd8, 0xe1, 0xce, 0x78, 0x67, 0x32, 0x88, + 0x6f, 0x70, 0x34, 0xc5, 0x77, 0x3f, 0x2c, 0x84, 0x03, 0x29, 0xac, 0x03, 0x1e, 0xb7, 0xf4, 0x96, + 0x05, 0x6d, 0x5b, 0x66, 0xf1, 0xe5, 0x2a, 0x40, 0x57, 0xab, 0x00, 0xfd, 0x5e, 0x05, 0xe8, 0xfb, + 0x3a, 0xf0, 0xae, 0xd6, 0x81, 0xf7, 0x73, 0x1d, 0x78, 0x1f, 0x9f, 0x65, 0xc2, 0x2d, 0xca, 0x84, + 0xa4, 0x3a, 0xa7, 0xbc, 0xca, 0x41, 0x59, 0xa1, 0xd5, 0x59, 0xf5, 0xb5, 0x07, 0x8f, 0x0d, 0x3f, + 0xa1, 0x67, 0x1b, 0x07, 0x45, 0xeb, 0xb3, 0x49, 0x76, 0xeb, 0xf7, 0x7a, 0xfa, 0x37, 0x00, 0x00, + 0xff, 0xff, 0x49, 0x03, 0xc8, 0x30, 0x76, 0x02, 0x00, 0x00, +} + +func (this *Params) Equal(that interface{}) bool { + if that == nil { + return this == nil + } + + that1, ok := that.(*Params) + if !ok { + that2, ok := that.(Params) + if ok { + that1 = &that2 + } else { + return false + } + } + if that1 == nil { + return this == nil + } else if this == nil { + return false + } + if this.UnbondingTime != that1.UnbondingTime { + return false + } + if this.HistoricalEntries != that1.HistoricalEntries { + return false + } + return true +} +func (m *Params) 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 *Params) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Params) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.HistoricalEntries != 0 { + i = encodeVarintSequencers(dAtA, i, uint64(m.HistoricalEntries)) + i-- + dAtA[i] = 0x10 + } + n1, err1 := github_com_gogo_protobuf_types.StdDurationMarshalTo(m.UnbondingTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(m.UnbondingTime):]) + if err1 != nil { + return 0, err1 + } + i -= n1 + i = encodeVarintSequencers(dAtA, i, uint64(n1)) + i-- + dAtA[i] = 0xa + return len(dAtA) - i, nil +} + +func (m *Sequencer) 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 *Sequencer) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *Sequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintSequencers(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } + if len(m.RewardAddr) > 0 { + i -= len(m.RewardAddr) + copy(dAtA[i:], m.RewardAddr) + i = encodeVarintSequencers(dAtA, i, uint64(len(m.RewardAddr))) + i-- + dAtA[i] = 0x12 + } + if m.Validator != nil { + { + size, err := m.Validator.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintSequencers(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *WhitelistedRelayers) 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 *WhitelistedRelayers) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *WhitelistedRelayers) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintSequencers(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0xa + } + } + return len(dAtA) - i, nil +} + +func encodeVarintSequencers(dAtA []byte, offset int, v uint64) int { + offset -= sovSequencers(v) + base := offset + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return base +} +func (m *Params) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = github_com_gogo_protobuf_types.SizeOfStdDuration(m.UnbondingTime) + n += 1 + l + sovSequencers(uint64(l)) + if m.HistoricalEntries != 0 { + n += 1 + sovSequencers(uint64(m.HistoricalEntries)) + } + return n +} + +func (m *Sequencer) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if m.Validator != nil { + l = m.Validator.Size() + n += 1 + l + sovSequencers(uint64(l)) + } + l = len(m.RewardAddr) + if l > 0 { + n += 1 + l + sovSequencers(uint64(l)) + } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovSequencers(uint64(l)) + } + } + return n +} + +func (m *WhitelistedRelayers) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovSequencers(uint64(l)) + } + } + return n +} + +func sovSequencers(x uint64) (n int) { + return (math_bits.Len64(x|1) + 6) / 7 +} +func sozSequencers(x uint64) (n int) { + return sovSequencers(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *Params) 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 ErrIntOverflowSequencers + } + 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: Params: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Params: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field UnbondingTime", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthSequencers + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSequencers + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := github_com_gogo_protobuf_types.StdDurationUnmarshal(&m.UnbondingTime, dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field HistoricalEntries", wireType) + } + m.HistoricalEntries = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.HistoricalEntries |= uint32(b&0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipSequencers(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthSequencers + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Sequencer) 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 ErrIntOverflowSequencers + } + 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: Sequencer: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Sequencer: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Validator", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthSequencers + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthSequencers + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Validator == nil { + m.Validator = &types1.Validator{} + } + if err := m.Validator.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + 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 ErrInvalidLengthSequencers + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSequencers + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.RewardAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + 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 ErrInvalidLengthSequencers + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSequencers + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipSequencers(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthSequencers + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *WhitelistedRelayers) 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 ErrIntOverflowSequencers + } + 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: WhitelistedRelayers: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: WhitelistedRelayers: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSequencers + } + 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 ErrInvalidLengthSequencers + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthSequencers + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipSequencers(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthSequencers + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipSequencers(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + depth := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowSequencers + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowSequencers + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + case 1: + iNdEx += 8 + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowSequencers + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if length < 0 { + return 0, ErrInvalidLengthSequencers + } + iNdEx += length + case 3: + depth++ + case 4: + if depth == 0 { + return 0, ErrUnexpectedEndOfGroupSequencers + } + depth-- + case 5: + iNdEx += 4 + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + if iNdEx < 0 { + return 0, ErrInvalidLengthSequencers + } + if depth == 0 { + return iNdEx, nil + } + } + return 0, io.ErrUnexpectedEOF +} + +var ( + ErrInvalidLengthSequencers = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowSequencers = fmt.Errorf("proto: integer overflow") + ErrUnexpectedEndOfGroupSequencers = fmt.Errorf("proto: unexpected end of group") +) diff --git a/x/sequencers/types/tx.pb.go b/x/sequencers/types/tx.pb.go index 85cc88fe..16868ea3 100644 --- a/x/sequencers/types/tx.pb.go +++ b/x/sequencers/types/tx.pb.go @@ -8,8 +8,6 @@ import ( fmt "fmt" types "github.com/cosmos/cosmos-sdk/codec/types" _ "github.com/cosmos/cosmos-sdk/types/msgservice" - _ "github.com/cosmos/cosmos-sdk/x/staking/types" - _ "github.com/gogo/protobuf/gogoproto" grpc1 "github.com/gogo/protobuf/grpc" proto "github.com/gogo/protobuf/proto" grpc "google.golang.org/grpc" @@ -31,27 +29,25 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -type MsgCreateSequencer struct { - // Operator is the bech32-encoded address of the actor sending the update - must be val addr +type MsgUpdateRewardAddress struct { + // Operator is the bech32-encoded address of the actor sending the update Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` - // PubKey is a tendermint consensus pub key - PubKey *types.Any `protobuf:"bytes,2,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"` - // Signature is operator signed with the private key of pub_key - Signature []byte `protobuf:"bytes,3,opt,name=signature,proto3" json:"signature,omitempty"` + // RewardAddr is a bech32 encoded sdk acc address + RewardAddr string `protobuf:"bytes,2,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` } -func (m *MsgCreateSequencer) Reset() { *m = MsgCreateSequencer{} } -func (m *MsgCreateSequencer) String() string { return proto.CompactTextString(m) } -func (*MsgCreateSequencer) ProtoMessage() {} -func (*MsgCreateSequencer) Descriptor() ([]byte, []int) { +func (m *MsgUpdateRewardAddress) Reset() { *m = MsgUpdateRewardAddress{} } +func (m *MsgUpdateRewardAddress) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateRewardAddress) ProtoMessage() {} +func (*MsgUpdateRewardAddress) Descriptor() ([]byte, []int) { return fileDescriptor_aee37376ffafeb0a, []int{0} } -func (m *MsgCreateSequencer) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateRewardAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgCreateSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateRewardAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgCreateSequencer.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateRewardAddress.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -61,54 +57,137 @@ func (m *MsgCreateSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgCreateSequencer) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateSequencer.Merge(m, src) +func (m *MsgUpdateRewardAddress) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateRewardAddress.Merge(m, src) } -func (m *MsgCreateSequencer) XXX_Size() int { +func (m *MsgUpdateRewardAddress) XXX_Size() int { return m.Size() } -func (m *MsgCreateSequencer) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateSequencer.DiscardUnknown(m) +func (m *MsgUpdateRewardAddress) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateRewardAddress.DiscardUnknown(m) } -var xxx_messageInfo_MsgCreateSequencer proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateRewardAddress proto.InternalMessageInfo -func (m *MsgCreateSequencer) GetOperator() string { +func (m *MsgUpdateRewardAddress) GetOperator() string { if m != nil { return m.Operator } return "" } -func (m *MsgCreateSequencer) GetPubKey() *types.Any { +func (m *MsgUpdateRewardAddress) GetRewardAddr() string { if m != nil { - return m.PubKey + return m.RewardAddr } - return nil + return "" +} + +type MsgUpdateRewardAddressResponse struct { +} + +func (m *MsgUpdateRewardAddressResponse) Reset() { *m = MsgUpdateRewardAddressResponse{} } +func (m *MsgUpdateRewardAddressResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateRewardAddressResponse) ProtoMessage() {} +func (*MsgUpdateRewardAddressResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_aee37376ffafeb0a, []int{1} +} +func (m *MsgUpdateRewardAddressResponse) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateRewardAddressResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateRewardAddressResponse.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 *MsgUpdateRewardAddressResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateRewardAddressResponse.Merge(m, src) +} +func (m *MsgUpdateRewardAddressResponse) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateRewardAddressResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateRewardAddressResponse.DiscardUnknown(m) } -func (m *MsgCreateSequencer) GetSignature() []byte { +var xxx_messageInfo_MsgUpdateRewardAddressResponse proto.InternalMessageInfo + +type MsgUpdateWhitelistedRelayers struct { + // Operator is the bech32-encoded address of the actor sending the update + Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,2,rep,name=relayers,proto3" json:"relayers,omitempty"` +} + +func (m *MsgUpdateWhitelistedRelayers) Reset() { *m = MsgUpdateWhitelistedRelayers{} } +func (m *MsgUpdateWhitelistedRelayers) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateWhitelistedRelayers) ProtoMessage() {} +func (*MsgUpdateWhitelistedRelayers) Descriptor() ([]byte, []int) { + return fileDescriptor_aee37376ffafeb0a, []int{2} +} +func (m *MsgUpdateWhitelistedRelayers) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *MsgUpdateWhitelistedRelayers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_MsgUpdateWhitelistedRelayers.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 *MsgUpdateWhitelistedRelayers) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateWhitelistedRelayers.Merge(m, src) +} +func (m *MsgUpdateWhitelistedRelayers) XXX_Size() int { + return m.Size() +} +func (m *MsgUpdateWhitelistedRelayers) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateWhitelistedRelayers.DiscardUnknown(m) +} + +var xxx_messageInfo_MsgUpdateWhitelistedRelayers proto.InternalMessageInfo + +func (m *MsgUpdateWhitelistedRelayers) GetOperator() string { if m != nil { - return m.Signature + return m.Operator + } + return "" +} + +func (m *MsgUpdateWhitelistedRelayers) GetRelayers() []string { + if m != nil { + return m.Relayers } return nil } -type MsgCreateSequencerResponse struct { +type MsgUpdateWhitelistedRelayersResponse struct { } -func (m *MsgCreateSequencerResponse) Reset() { *m = MsgCreateSequencerResponse{} } -func (m *MsgCreateSequencerResponse) String() string { return proto.CompactTextString(m) } -func (*MsgCreateSequencerResponse) ProtoMessage() {} -func (*MsgCreateSequencerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_aee37376ffafeb0a, []int{1} +func (m *MsgUpdateWhitelistedRelayersResponse) Reset() { *m = MsgUpdateWhitelistedRelayersResponse{} } +func (m *MsgUpdateWhitelistedRelayersResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateWhitelistedRelayersResponse) ProtoMessage() {} +func (*MsgUpdateWhitelistedRelayersResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_aee37376ffafeb0a, []int{3} } -func (m *MsgCreateSequencerResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateWhitelistedRelayersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgCreateSequencerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateWhitelistedRelayersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgCreateSequencerResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateWhitelistedRelayersResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -118,37 +197,42 @@ func (m *MsgCreateSequencerResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } -func (m *MsgCreateSequencerResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgCreateSequencerResponse.Merge(m, src) +func (m *MsgUpdateWhitelistedRelayersResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateWhitelistedRelayersResponse.Merge(m, src) } -func (m *MsgCreateSequencerResponse) XXX_Size() int { +func (m *MsgUpdateWhitelistedRelayersResponse) XXX_Size() int { return m.Size() } -func (m *MsgCreateSequencerResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgCreateSequencerResponse.DiscardUnknown(m) +func (m *MsgUpdateWhitelistedRelayersResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateWhitelistedRelayersResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgCreateSequencerResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateWhitelistedRelayersResponse proto.InternalMessageInfo -type MsgUpdateSequencer struct { - // Operator is the bech32-encoded address of the actor sending the update - must be val addr +// ConsensusMsgUpsertSequencer is a consensus message to upsert the sequencer. +type ConsensusMsgUpsertSequencer struct { + // Operator is the bech32-encoded address of the actor sending the update Operator string `protobuf:"bytes,1,opt,name=operator,proto3" json:"operator,omitempty"` - // RewardAddr is a bech32 encoded sdk acc address + // ConsPubKey is a tendermint consensus pub key + ConsPubKey *types.Any `protobuf:"bytes,2,opt,name=cons_pub_key,json=consPubKey,proto3" json:"cons_pub_key,omitempty"` + // RewardAddr is the bech32-encoded sequencer's reward address RewardAddr string `protobuf:"bytes,3,opt,name=reward_addr,json=rewardAddr,proto3" json:"reward_addr,omitempty"` + // Relayers is an array of the whitelisted relayer addresses. Addresses are bech32-encoded strings. + Relayers []string `protobuf:"bytes,4,rep,name=relayers,proto3" json:"relayers,omitempty"` } -func (m *MsgUpdateSequencer) Reset() { *m = MsgUpdateSequencer{} } -func (m *MsgUpdateSequencer) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateSequencer) ProtoMessage() {} -func (*MsgUpdateSequencer) Descriptor() ([]byte, []int) { - return fileDescriptor_aee37376ffafeb0a, []int{2} +func (m *ConsensusMsgUpsertSequencer) Reset() { *m = ConsensusMsgUpsertSequencer{} } +func (m *ConsensusMsgUpsertSequencer) String() string { return proto.CompactTextString(m) } +func (*ConsensusMsgUpsertSequencer) ProtoMessage() {} +func (*ConsensusMsgUpsertSequencer) Descriptor() ([]byte, []int) { + return fileDescriptor_aee37376ffafeb0a, []int{4} } -func (m *MsgUpdateSequencer) XXX_Unmarshal(b []byte) error { +func (m *ConsensusMsgUpsertSequencer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *ConsensusMsgUpsertSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateSequencer.Marshal(b, m, deterministic) + return xxx_messageInfo_ConsensusMsgUpsertSequencer.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -158,47 +242,61 @@ func (m *MsgUpdateSequencer) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgUpdateSequencer) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateSequencer.Merge(m, src) +func (m *ConsensusMsgUpsertSequencer) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConsensusMsgUpsertSequencer.Merge(m, src) } -func (m *MsgUpdateSequencer) XXX_Size() int { +func (m *ConsensusMsgUpsertSequencer) XXX_Size() int { return m.Size() } -func (m *MsgUpdateSequencer) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateSequencer.DiscardUnknown(m) +func (m *ConsensusMsgUpsertSequencer) XXX_DiscardUnknown() { + xxx_messageInfo_ConsensusMsgUpsertSequencer.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateSequencer proto.InternalMessageInfo +var xxx_messageInfo_ConsensusMsgUpsertSequencer proto.InternalMessageInfo -func (m *MsgUpdateSequencer) GetOperator() string { +func (m *ConsensusMsgUpsertSequencer) GetOperator() string { if m != nil { return m.Operator } return "" } -func (m *MsgUpdateSequencer) GetRewardAddr() string { +func (m *ConsensusMsgUpsertSequencer) GetConsPubKey() *types.Any { + if m != nil { + return m.ConsPubKey + } + return nil +} + +func (m *ConsensusMsgUpsertSequencer) GetRewardAddr() string { if m != nil { return m.RewardAddr } return "" } -type MsgUpdateSequencerResponse struct { +func (m *ConsensusMsgUpsertSequencer) GetRelayers() []string { + if m != nil { + return m.Relayers + } + return nil } -func (m *MsgUpdateSequencerResponse) Reset() { *m = MsgUpdateSequencerResponse{} } -func (m *MsgUpdateSequencerResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateSequencerResponse) ProtoMessage() {} -func (*MsgUpdateSequencerResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_aee37376ffafeb0a, []int{3} +type ConsensusMsgUpsertSequencerResponse struct { +} + +func (m *ConsensusMsgUpsertSequencerResponse) Reset() { *m = ConsensusMsgUpsertSequencerResponse{} } +func (m *ConsensusMsgUpsertSequencerResponse) String() string { return proto.CompactTextString(m) } +func (*ConsensusMsgUpsertSequencerResponse) ProtoMessage() {} +func (*ConsensusMsgUpsertSequencerResponse) Descriptor() ([]byte, []int) { + return fileDescriptor_aee37376ffafeb0a, []int{5} } -func (m *MsgUpdateSequencerResponse) XXX_Unmarshal(b []byte) error { +func (m *ConsensusMsgUpsertSequencerResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateSequencerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *ConsensusMsgUpsertSequencerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateSequencerResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_ConsensusMsgUpsertSequencerResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -208,55 +306,60 @@ func (m *MsgUpdateSequencerResponse) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } -func (m *MsgUpdateSequencerResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateSequencerResponse.Merge(m, src) +func (m *ConsensusMsgUpsertSequencerResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_ConsensusMsgUpsertSequencerResponse.Merge(m, src) } -func (m *MsgUpdateSequencerResponse) XXX_Size() int { +func (m *ConsensusMsgUpsertSequencerResponse) XXX_Size() int { return m.Size() } -func (m *MsgUpdateSequencerResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateSequencerResponse.DiscardUnknown(m) +func (m *ConsensusMsgUpsertSequencerResponse) XXX_DiscardUnknown() { + xxx_messageInfo_ConsensusMsgUpsertSequencerResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateSequencerResponse proto.InternalMessageInfo +var xxx_messageInfo_ConsensusMsgUpsertSequencerResponse proto.InternalMessageInfo func init() { - proto.RegisterType((*MsgCreateSequencer)(nil), "rollapp.sequencers.types.MsgCreateSequencer") - proto.RegisterType((*MsgCreateSequencerResponse)(nil), "rollapp.sequencers.types.MsgCreateSequencerResponse") - proto.RegisterType((*MsgUpdateSequencer)(nil), "rollapp.sequencers.types.MsgUpdateSequencer") - proto.RegisterType((*MsgUpdateSequencerResponse)(nil), "rollapp.sequencers.types.MsgUpdateSequencerResponse") + proto.RegisterType((*MsgUpdateRewardAddress)(nil), "rollapp.sequencers.types.MsgUpdateRewardAddress") + proto.RegisterType((*MsgUpdateRewardAddressResponse)(nil), "rollapp.sequencers.types.MsgUpdateRewardAddressResponse") + proto.RegisterType((*MsgUpdateWhitelistedRelayers)(nil), "rollapp.sequencers.types.MsgUpdateWhitelistedRelayers") + proto.RegisterType((*MsgUpdateWhitelistedRelayersResponse)(nil), "rollapp.sequencers.types.MsgUpdateWhitelistedRelayersResponse") + proto.RegisterType((*ConsensusMsgUpsertSequencer)(nil), "rollapp.sequencers.types.ConsensusMsgUpsertSequencer") + proto.RegisterType((*ConsensusMsgUpsertSequencerResponse)(nil), "rollapp.sequencers.types.ConsensusMsgUpsertSequencerResponse") } func init() { proto.RegisterFile("sequencers/tx.proto", fileDescriptor_aee37376ffafeb0a) } var fileDescriptor_aee37376ffafeb0a = []byte{ - // 402 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x93, 0xbf, 0xae, 0xd3, 0x30, - 0x14, 0xc6, 0x6b, 0xae, 0x74, 0xa1, 0xbe, 0x20, 0xa4, 0x50, 0x89, 0x10, 0x55, 0xa1, 0xaa, 0x18, - 0x2a, 0x44, 0x6d, 0xb5, 0x30, 0x20, 0xb6, 0xc2, 0x88, 0xba, 0x04, 0xb1, 0xb0, 0x14, 0xa7, 0x3e, - 0x98, 0xa8, 0x8d, 0x6d, 0x6c, 0x07, 0x1a, 0x46, 0x66, 0x06, 0x1e, 0x85, 0xc7, 0x60, 0xec, 0xc8, - 0x88, 0xda, 0x81, 0x07, 0xe0, 0x05, 0x50, 0x92, 0xa6, 0x45, 0x29, 0xe5, 0xcf, 0x94, 0x7c, 0xe7, - 0x7c, 0x3a, 0xbf, 0xef, 0x24, 0x36, 0xbe, 0x61, 0xe1, 0x4d, 0x06, 0x72, 0x0e, 0xc6, 0x52, 0xb7, - 0x22, 0xda, 0x28, 0xa7, 0x3c, 0xdf, 0xa8, 0xe5, 0x92, 0x69, 0x4d, 0x0e, 0x4d, 0xe2, 0x72, 0x0d, - 0x36, 0xe8, 0x08, 0x25, 0x54, 0x69, 0xa2, 0xc5, 0x5b, 0xe5, 0x0f, 0xee, 0xcc, 0x95, 0x4d, 0x95, - 0xa5, 0xd6, 0xb1, 0x45, 0x22, 0x05, 0x7d, 0x3b, 0x8a, 0xc1, 0xb1, 0x51, 0xad, 0x77, 0xae, 0x9b, - 0x3b, 0x57, 0x6a, 0x0b, 0x47, 0xf1, 0xd8, 0x35, 0x6e, 0x09, 0xa5, 0xc4, 0x12, 0x68, 0xa9, 0xe2, - 0xec, 0x15, 0x65, 0x32, 0xaf, 0x5a, 0xfd, 0x8f, 0x08, 0x7b, 0x53, 0x2b, 0x9e, 0x18, 0x60, 0x0e, - 0x9e, 0xd5, 0x69, 0xbc, 0x00, 0x5f, 0x51, 0x1a, 0x0c, 0x73, 0xca, 0xf8, 0xa8, 0x87, 0x06, 0xed, - 0x68, 0xaf, 0xbd, 0x21, 0xbe, 0xac, 0xb3, 0x78, 0xb6, 0x80, 0xdc, 0xbf, 0xd4, 0x43, 0x83, 0x8b, - 0x71, 0x87, 0x54, 0xf3, 0x49, 0x3d, 0x9f, 0x4c, 0x64, 0x1e, 0x9d, 0xeb, 0x2c, 0x7e, 0x0a, 0xb9, - 0xd7, 0xc5, 0x6d, 0x9b, 0x08, 0xc9, 0x5c, 0x66, 0xc0, 0x3f, 0xeb, 0xa1, 0xc1, 0xd5, 0xe8, 0x50, - 0x78, 0x74, 0xed, 0xc3, 0xf7, 0xcf, 0x77, 0xf7, 0xb3, 0xfb, 0x5d, 0x1c, 0x1c, 0xa7, 0x89, 0xc0, - 0x6a, 0x25, 0x2d, 0xf4, 0x5f, 0x96, 0x59, 0x9f, 0x6b, 0xfe, 0xcf, 0x59, 0x6f, 0xe3, 0x0b, 0x03, - 0xef, 0x98, 0xe1, 0x33, 0xc6, 0xb9, 0x29, 0xf1, 0xed, 0x08, 0x57, 0xa5, 0x09, 0xe7, 0xe6, 0xf7, - 0xfc, 0x06, 0xa1, 0xe6, 0x8f, 0x7f, 0x20, 0x7c, 0x36, 0xb5, 0xc2, 0xcb, 0xf0, 0xf5, 0xe6, 0x07, - 0xbb, 0x47, 0x4e, 0xfd, 0x52, 0x72, 0xbc, 0x50, 0xf0, 0xe0, 0x7f, 0xdc, 0x35, 0xbe, 0xc0, 0x36, - 0x77, 0xff, 0x33, 0xb6, 0xe1, 0xfe, 0x0b, 0xf6, 0xc4, 0xd6, 0x8f, 0xa3, 0x2f, 0x9b, 0x10, 0xad, - 0x37, 0x21, 0xfa, 0xb6, 0x09, 0xd1, 0xa7, 0x6d, 0xd8, 0x5a, 0x6f, 0xc3, 0xd6, 0xd7, 0x6d, 0xd8, - 0x7a, 0xf1, 0x50, 0x24, 0xee, 0x75, 0x16, 0x93, 0xb9, 0x4a, 0x29, 0xcf, 0x53, 0x90, 0x36, 0x51, - 0x72, 0x95, 0xbf, 0x3f, 0x88, 0xa1, 0xe1, 0x0b, 0xba, 0xa2, 0xbf, 0xde, 0x81, 0x02, 0x17, 0x9f, - 0x97, 0x47, 0xe5, 0xfe, 0xcf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x47, 0x32, 0xc4, 0x21, 0x1e, 0x03, - 0x00, 0x00, + // 459 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x8b, 0x13, 0x41, + 0x10, 0x4d, 0x6f, 0x44, 0xd6, 0x5a, 0x45, 0x98, 0x15, 0xcd, 0x8e, 0x32, 0x86, 0xf8, 0x81, 0x08, + 0xf6, 0xe8, 0x8a, 0xcb, 0x22, 0x28, 0xac, 0x1e, 0x65, 0x41, 0x46, 0x44, 0xf0, 0x12, 0x66, 0xd2, + 0xe5, 0x6c, 0xd8, 0x49, 0x77, 0xdb, 0xd5, 0xa3, 0x69, 0x6f, 0x7a, 0xf1, 0x2a, 0xf8, 0x2b, 0xbc, + 0xf9, 0x07, 0xbc, 0x7b, 0xdc, 0xa3, 0x47, 0x49, 0x0e, 0xfe, 0x0d, 0x99, 0x89, 0x33, 0xab, 0x21, + 0x19, 0xdc, 0x3d, 0x25, 0x45, 0xbd, 0xd7, 0xf5, 0xea, 0xbd, 0x62, 0x60, 0x9d, 0xf0, 0x75, 0x8e, + 0x72, 0x80, 0x86, 0x42, 0x3b, 0xe6, 0xda, 0x28, 0xab, 0xbc, 0x8e, 0x51, 0x59, 0x16, 0x6b, 0xcd, + 0x0f, 0x9b, 0xdc, 0x3a, 0x8d, 0xe4, 0x5f, 0x18, 0x28, 0x1a, 0x29, 0x0a, 0x47, 0x94, 0x86, 0x6f, + 0xee, 0x14, 0x3f, 0x33, 0x8a, 0xbf, 0x91, 0x2a, 0x95, 0x66, 0x18, 0x96, 0x55, 0x92, 0xbf, 0x0a, + 0x63, 0xe9, 0x66, 0xad, 0x9e, 0x80, 0xf3, 0xbb, 0x94, 0x3e, 0xd7, 0x22, 0xb6, 0x18, 0xe1, 0xdb, + 0xd8, 0x88, 0x1d, 0x21, 0x0c, 0x12, 0x79, 0x3e, 0xac, 0x2a, 0x8d, 0x26, 0xb6, 0xca, 0x74, 0x58, + 0x97, 0xdd, 0x38, 0x15, 0xd5, 0xb5, 0x77, 0x19, 0xd6, 0x4c, 0x09, 0xee, 0xc7, 0x42, 0x98, 0xce, + 0x4a, 0xd9, 0x06, 0x53, 0xf3, 0xef, 0x9f, 0xf9, 0xf0, 0xeb, 0xeb, 0xcd, 0x1a, 0xdf, 0xeb, 0x42, + 0xb0, 0x78, 0x4a, 0x84, 0xa4, 0x95, 0x24, 0xec, 0x21, 0x5c, 0xaa, 0x11, 0x2f, 0xf6, 0x86, 0x16, + 0xb3, 0x21, 0x59, 0x14, 0x11, 0x66, 0xb1, 0x43, 0xd3, 0xac, 0xc6, 0x87, 0x55, 0xf3, 0x07, 0xd7, + 0x59, 0xe9, 0xb6, 0x8b, 0x5e, 0x55, 0xcf, 0x0b, 0xb9, 0x0e, 0x57, 0x9b, 0xc6, 0xd4, 0x72, 0xbe, + 0x31, 0xb8, 0xf8, 0xb8, 0xf8, 0x27, 0x29, 0xa7, 0x92, 0x41, 0x68, 0xec, 0xb3, 0xca, 0xf1, 0x46, + 0x39, 0x5b, 0x70, 0x7a, 0xa0, 0x24, 0xf5, 0x75, 0x9e, 0xf4, 0xf7, 0xd1, 0x95, 0xee, 0xac, 0x6d, + 0x9e, 0xe3, 0xb3, 0x10, 0x78, 0x15, 0x02, 0xdf, 0x91, 0x2e, 0x82, 0x02, 0xf9, 0x34, 0x4f, 0x9e, + 0xa0, 0x9b, 0x37, 0xb5, 0x3d, 0x6f, 0xea, 0x3f, 0x7b, 0x9e, 0x68, 0xde, 0xf3, 0x1a, 0x5c, 0x69, + 0x90, 0x5f, 0xad, 0xb9, 0xf9, 0xa5, 0x0d, 0xed, 0x5d, 0x4a, 0xbd, 0xf7, 0x0c, 0xd6, 0x17, 0xdd, + 0xc0, 0x6d, 0xbe, 0xec, 0xd8, 0xf8, 0xe2, 0x3c, 0xfd, 0xed, 0xa3, 0x32, 0x2a, 0x2d, 0xde, 0x67, + 0x06, 0x1b, 0xcb, 0xf3, 0xdf, 0xfa, 0x8f, 0x77, 0x17, 0xf0, 0xfc, 0x87, 0xc7, 0xe3, 0xd5, 0xaa, + 0x3e, 0x32, 0x38, 0x3b, 0x1f, 0xfe, 0xbd, 0xe5, 0x6f, 0x36, 0x98, 0xee, 0x3f, 0x38, 0x16, 0xad, + 0x52, 0xf2, 0x28, 0xfa, 0x3e, 0x09, 0xd8, 0xc1, 0x24, 0x60, 0x3f, 0x27, 0x01, 0xfb, 0x34, 0x0d, + 0x5a, 0x07, 0xd3, 0xa0, 0xf5, 0x63, 0x1a, 0xb4, 0x5e, 0x6e, 0xa7, 0x43, 0xbb, 0x97, 0x27, 0x7c, + 0xa0, 0x46, 0xa1, 0x70, 0x23, 0x94, 0x34, 0x54, 0x72, 0xec, 0xde, 0x1d, 0x16, 0xb7, 0x8c, 0xd8, + 0x0f, 0xc7, 0xe1, 0xdf, 0x9f, 0x93, 0x62, 0x6e, 0x72, 0xb2, 0x3c, 0xc6, 0xbb, 0xbf, 0x03, 0x00, + 0x00, 0xff, 0xff, 0xb5, 0x74, 0xbe, 0x8f, 0x69, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -271,8 +374,11 @@ 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 { - CreateSequencer(ctx context.Context, in *MsgCreateSequencer, opts ...grpc.CallOption) (*MsgCreateSequencerResponse, error) - UpdateSequencer(ctx context.Context, in *MsgUpdateSequencer, opts ...grpc.CallOption) (*MsgUpdateSequencerResponse, error) + // Messages + UpdateRewardAddress(ctx context.Context, in *MsgUpdateRewardAddress, opts ...grpc.CallOption) (*MsgUpdateRewardAddressResponse, error) + UpdateWhitelistedRelayers(ctx context.Context, in *MsgUpdateWhitelistedRelayers, opts ...grpc.CallOption) (*MsgUpdateWhitelistedRelayersResponse, error) + // Consensus Messages + UpsertSequencer(ctx context.Context, in *ConsensusMsgUpsertSequencer, opts ...grpc.CallOption) (*ConsensusMsgUpsertSequencerResponse, error) } type msgClient struct { @@ -283,18 +389,27 @@ func NewMsgClient(cc grpc1.ClientConn) MsgClient { return &msgClient{cc} } -func (c *msgClient) CreateSequencer(ctx context.Context, in *MsgCreateSequencer, opts ...grpc.CallOption) (*MsgCreateSequencerResponse, error) { - out := new(MsgCreateSequencerResponse) - err := c.cc.Invoke(ctx, "/rollapp.sequencers.types.Msg/CreateSequencer", in, out, opts...) +func (c *msgClient) UpdateRewardAddress(ctx context.Context, in *MsgUpdateRewardAddress, opts ...grpc.CallOption) (*MsgUpdateRewardAddressResponse, error) { + out := new(MsgUpdateRewardAddressResponse) + err := c.cc.Invoke(ctx, "/rollapp.sequencers.types.Msg/UpdateRewardAddress", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *msgClient) UpdateSequencer(ctx context.Context, in *MsgUpdateSequencer, opts ...grpc.CallOption) (*MsgUpdateSequencerResponse, error) { - out := new(MsgUpdateSequencerResponse) - err := c.cc.Invoke(ctx, "/rollapp.sequencers.types.Msg/UpdateSequencer", in, out, opts...) +func (c *msgClient) UpdateWhitelistedRelayers(ctx context.Context, in *MsgUpdateWhitelistedRelayers, opts ...grpc.CallOption) (*MsgUpdateWhitelistedRelayersResponse, error) { + out := new(MsgUpdateWhitelistedRelayersResponse) + err := c.cc.Invoke(ctx, "/rollapp.sequencers.types.Msg/UpdateWhitelistedRelayers", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + +func (c *msgClient) UpsertSequencer(ctx context.Context, in *ConsensusMsgUpsertSequencer, opts ...grpc.CallOption) (*ConsensusMsgUpsertSequencerResponse, error) { + out := new(ConsensusMsgUpsertSequencerResponse) + err := c.cc.Invoke(ctx, "/rollapp.sequencers.types.Msg/UpsertSequencer", in, out, opts...) if err != nil { return nil, err } @@ -303,57 +418,81 @@ func (c *msgClient) UpdateSequencer(ctx context.Context, in *MsgUpdateSequencer, // MsgServer is the server API for Msg service. type MsgServer interface { - CreateSequencer(context.Context, *MsgCreateSequencer) (*MsgCreateSequencerResponse, error) - UpdateSequencer(context.Context, *MsgUpdateSequencer) (*MsgUpdateSequencerResponse, error) + // Messages + UpdateRewardAddress(context.Context, *MsgUpdateRewardAddress) (*MsgUpdateRewardAddressResponse, error) + UpdateWhitelistedRelayers(context.Context, *MsgUpdateWhitelistedRelayers) (*MsgUpdateWhitelistedRelayersResponse, error) + // Consensus Messages + UpsertSequencer(context.Context, *ConsensusMsgUpsertSequencer) (*ConsensusMsgUpsertSequencerResponse, error) } // UnimplementedMsgServer can be embedded to have forward compatible implementations. type UnimplementedMsgServer struct { } -func (*UnimplementedMsgServer) CreateSequencer(ctx context.Context, req *MsgCreateSequencer) (*MsgCreateSequencerResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method CreateSequencer not implemented") +func (*UnimplementedMsgServer) UpdateRewardAddress(ctx context.Context, req *MsgUpdateRewardAddress) (*MsgUpdateRewardAddressResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateRewardAddress not implemented") +} +func (*UnimplementedMsgServer) UpdateWhitelistedRelayers(ctx context.Context, req *MsgUpdateWhitelistedRelayers) (*MsgUpdateWhitelistedRelayersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateWhitelistedRelayers not implemented") } -func (*UnimplementedMsgServer) UpdateSequencer(ctx context.Context, req *MsgUpdateSequencer) (*MsgUpdateSequencerResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateSequencer not implemented") +func (*UnimplementedMsgServer) UpsertSequencer(ctx context.Context, req *ConsensusMsgUpsertSequencer) (*ConsensusMsgUpsertSequencerResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpsertSequencer not implemented") } func RegisterMsgServer(s grpc1.Server, srv MsgServer) { s.RegisterService(&_Msg_serviceDesc, srv) } -func _Msg_CreateSequencer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgCreateSequencer) +func _Msg_UpdateRewardAddress_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUpdateRewardAddress) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(MsgServer).UpdateRewardAddress(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/rollapp.sequencers.types.Msg/UpdateRewardAddress", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(MsgServer).UpdateRewardAddress(ctx, req.(*MsgUpdateRewardAddress)) + } + return interceptor(ctx, in, info, handler) +} + +func _Msg_UpdateWhitelistedRelayers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUpdateWhitelistedRelayers) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).CreateSequencer(ctx, in) + return srv.(MsgServer).UpdateWhitelistedRelayers(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rollapp.sequencers.types.Msg/CreateSequencer", + FullMethod: "/rollapp.sequencers.types.Msg/UpdateWhitelistedRelayers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).CreateSequencer(ctx, req.(*MsgCreateSequencer)) + return srv.(MsgServer).UpdateWhitelistedRelayers(ctx, req.(*MsgUpdateWhitelistedRelayers)) } return interceptor(ctx, in, info, handler) } -func _Msg_UpdateSequencer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateSequencer) +func _Msg_UpsertSequencer_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(ConsensusMsgUpsertSequencer) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).UpdateSequencer(ctx, in) + return srv.(MsgServer).UpsertSequencer(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/rollapp.sequencers.types.Msg/UpdateSequencer", + FullMethod: "/rollapp.sequencers.types.Msg/UpsertSequencer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateSequencer(ctx, req.(*MsgUpdateSequencer)) + return srv.(MsgServer).UpsertSequencer(ctx, req.(*ConsensusMsgUpsertSequencer)) } return interceptor(ctx, in, info, handler) } @@ -363,19 +502,23 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ HandlerType: (*MsgServer)(nil), Methods: []grpc.MethodDesc{ { - MethodName: "CreateSequencer", - Handler: _Msg_CreateSequencer_Handler, + MethodName: "UpdateRewardAddress", + Handler: _Msg_UpdateRewardAddress_Handler, }, { - MethodName: "UpdateSequencer", - Handler: _Msg_UpdateSequencer_Handler, + MethodName: "UpdateWhitelistedRelayers", + Handler: _Msg_UpdateWhitelistedRelayers_Handler, + }, + { + MethodName: "UpsertSequencer", + Handler: _Msg_UpsertSequencer_Handler, }, }, Streams: []grpc.StreamDesc{}, Metadata: "sequencers/tx.proto", } -func (m *MsgCreateSequencer) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateRewardAddress) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -385,34 +528,84 @@ func (m *MsgCreateSequencer) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgCreateSequencer) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateRewardAddress) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgCreateSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateRewardAddress) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l - if len(m.Signature) > 0 { - i -= len(m.Signature) - copy(dAtA[i:], m.Signature) - i = encodeVarintTx(dAtA, i, uint64(len(m.Signature))) + if len(m.RewardAddr) > 0 { + i -= len(m.RewardAddr) + copy(dAtA[i:], m.RewardAddr) + i = encodeVarintTx(dAtA, i, uint64(len(m.RewardAddr))) i-- - dAtA[i] = 0x1a + dAtA[i] = 0x12 } - if m.PubKey != nil { - { - size, err := m.PubKey.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintTx(dAtA, i, uint64(size)) - } + if len(m.Operator) > 0 { + i -= len(m.Operator) + copy(dAtA[i:], m.Operator) + i = encodeVarintTx(dAtA, i, uint64(len(m.Operator))) i-- - dAtA[i] = 0x12 + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + +func (m *MsgUpdateRewardAddressResponse) 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 *MsgUpdateRewardAddressResponse) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateRewardAddressResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + return len(dAtA) - i, nil +} + +func (m *MsgUpdateWhitelistedRelayers) 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 *MsgUpdateWhitelistedRelayers) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *MsgUpdateWhitelistedRelayers) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintTx(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x12 + } } if len(m.Operator) > 0 { i -= len(m.Operator) @@ -424,7 +617,7 @@ func (m *MsgCreateSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgCreateSequencerResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateWhitelistedRelayersResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -434,12 +627,12 @@ func (m *MsgCreateSequencerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgCreateSequencerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateWhitelistedRelayersResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgCreateSequencerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateWhitelistedRelayersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -447,7 +640,7 @@ func (m *MsgCreateSequencerResponse) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *MsgUpdateSequencer) Marshal() (dAtA []byte, err error) { +func (m *ConsensusMsgUpsertSequencer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -457,16 +650,25 @@ func (m *MsgUpdateSequencer) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateSequencer) MarshalTo(dAtA []byte) (int, error) { +func (m *ConsensusMsgUpsertSequencer) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ConsensusMsgUpsertSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintTx(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x22 + } + } if len(m.RewardAddr) > 0 { i -= len(m.RewardAddr) copy(dAtA[i:], m.RewardAddr) @@ -474,6 +676,18 @@ func (m *MsgUpdateSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x1a } + if m.ConsPubKey != nil { + { + size, err := m.ConsPubKey.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintTx(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } if len(m.Operator) > 0 { i -= len(m.Operator) copy(dAtA[i:], m.Operator) @@ -484,7 +698,7 @@ func (m *MsgUpdateSequencer) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgUpdateSequencerResponse) Marshal() (dAtA []byte, err error) { +func (m *ConsensusMsgUpsertSequencerResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -494,12 +708,12 @@ func (m *MsgUpdateSequencerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateSequencerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *ConsensusMsgUpsertSequencerResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateSequencerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *ConsensusMsgUpsertSequencerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -518,7 +732,7 @@ func encodeVarintTx(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) return base } -func (m *MsgCreateSequencer) Size() (n int) { +func (m *MsgUpdateRewardAddress) Size() (n int) { if m == nil { return 0 } @@ -528,18 +742,42 @@ func (m *MsgCreateSequencer) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } - if m.PubKey != nil { - l = m.PubKey.Size() + l = len(m.RewardAddr) + if l > 0 { n += 1 + l + sovTx(uint64(l)) } - l = len(m.Signature) + return n +} + +func (m *MsgUpdateRewardAddressResponse) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + return n +} + +func (m *MsgUpdateWhitelistedRelayers) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.Operator) if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovTx(uint64(l)) + } + } return n } -func (m *MsgCreateSequencerResponse) Size() (n int) { +func (m *MsgUpdateWhitelistedRelayersResponse) Size() (n int) { if m == nil { return 0 } @@ -548,7 +786,7 @@ func (m *MsgCreateSequencerResponse) Size() (n int) { return n } -func (m *MsgUpdateSequencer) Size() (n int) { +func (m *ConsensusMsgUpsertSequencer) Size() (n int) { if m == nil { return 0 } @@ -558,14 +796,24 @@ func (m *MsgUpdateSequencer) Size() (n int) { if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if m.ConsPubKey != nil { + l = m.ConsPubKey.Size() + n += 1 + l + sovTx(uint64(l)) + } l = len(m.RewardAddr) if l > 0 { n += 1 + l + sovTx(uint64(l)) } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovTx(uint64(l)) + } + } return n } -func (m *MsgUpdateSequencerResponse) Size() (n int) { +func (m *ConsensusMsgUpsertSequencerResponse) Size() (n int) { if m == nil { return 0 } @@ -580,7 +828,7 @@ func sovTx(x uint64) (n int) { func sozTx(x uint64) (n int) { return sovTx(uint64((x << 1) ^ uint64((int64(x) >> 63)))) } -func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateRewardAddress) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -603,10 +851,10 @@ func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateSequencer: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateRewardAddress: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateSequencer: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateRewardAddress: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -643,9 +891,9 @@ func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PubKey", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -655,33 +903,129 @@ func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - if m.PubKey == nil { - m.PubKey = &types.Any{} + m.RewardAddr = 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 *MsgUpdateRewardAddressResponse) 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 } - if err := m.PubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: MsgUpdateRewardAddressResponse: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateRewardAddressResponse: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipTx(dAtA[iNdEx:]) + if err != nil { return err } - iNdEx = postIndex - case 3: + 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 *MsgUpdateWhitelistedRelayers) 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: MsgUpdateWhitelistedRelayers: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: MsgUpdateWhitelistedRelayers: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Signature", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Operator", wireType) } - var byteLen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowTx @@ -691,25 +1035,55 @@ func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - byteLen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if byteLen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthTx } - postIndex := iNdEx + byteLen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthTx } if postIndex > l { return io.ErrUnexpectedEOF } - m.Signature = append(m.Signature[:0], dAtA[iNdEx:postIndex]...) - if m.Signature == nil { - m.Signature = []byte{} + m.Operator = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", 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.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex default: iNdEx = preIndex @@ -732,7 +1106,7 @@ func (m *MsgCreateSequencer) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgCreateSequencerResponse) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateWhitelistedRelayersResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -755,10 +1129,10 @@ func (m *MsgCreateSequencerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgCreateSequencerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateWhitelistedRelayersResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgCreateSequencerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateWhitelistedRelayersResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: @@ -782,7 +1156,7 @@ func (m *MsgCreateSequencerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateSequencer) Unmarshal(dAtA []byte) error { +func (m *ConsensusMsgUpsertSequencer) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -805,10 +1179,10 @@ func (m *MsgUpdateSequencer) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateSequencer: wiretype end group for non-group") + return fmt.Errorf("proto: ConsensusMsgUpsertSequencer: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateSequencer: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ConsensusMsgUpsertSequencer: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -843,6 +1217,42 @@ func (m *MsgUpdateSequencer) Unmarshal(dAtA []byte) error { } m.Operator = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ConsPubKey", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTx + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTx + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthTx + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ConsPubKey == nil { + m.ConsPubKey = &types.Any{} + } + if err := m.ConsPubKey.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 3: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field RewardAddr", wireType) @@ -875,6 +1285,38 @@ func (m *MsgUpdateSequencer) Unmarshal(dAtA []byte) error { } m.RewardAddr = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", 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.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipTx(dAtA[iNdEx:]) @@ -896,7 +1338,7 @@ func (m *MsgUpdateSequencer) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateSequencerResponse) Unmarshal(dAtA []byte) error { +func (m *ConsensusMsgUpsertSequencerResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -919,10 +1361,10 @@ func (m *MsgUpdateSequencerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateSequencerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: ConsensusMsgUpsertSequencerResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateSequencerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: ConsensusMsgUpsertSequencerResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { default: