diff --git a/proto/opinit/ophost/v1/tx.proto b/proto/opinit/ophost/v1/tx.proto index 7546b1de..6e06180b 100644 --- a/proto/opinit/ophost/v1/tx.proto +++ b/proto/opinit/ophost/v1/tx.proto @@ -54,8 +54,8 @@ service Msg { // UpdateProposer defines a rpc handler method for MsgUpdateProposer. rpc UpdateProposer(MsgUpdateProposer) returns (MsgUpdateProposerResponse); - // UpdateChallenger defines a rpc handler method for MsgUpdateChallenger. - rpc UpdateChallenger(MsgUpdateChallenger) returns (MsgUpdateChallengerResponse); + // UpdateChallengers defines a rpc handler method for MsgUpdateChallengers. + rpc UpdateChallengers(MsgUpdateChallengers) returns (MsgUpdateChallengersResponse); // UpdateBatchInfo defines a rpc handler method for MsgUpdateBatchInfo. rpc UpdateBatchInfo(MsgUpdateBatchInfo) returns (MsgUpdateBatchInfoResponse); @@ -220,21 +220,22 @@ message MsgUpdateProposerResponse { } // MsgUpdateChallenger is a message to change a challenger -message MsgUpdateChallenger { +message MsgUpdateChallengers { option (cosmos.msg.v1.signer) = "authority"; - option (amino.name) = "ophost/MsgUpdateChallenger"; + option (amino.name) = "ophost/MsgUpdateChallengers"; // authority is the address that controls the module (defaults to x/gov unless overwritten) - // or the current challenger address.(supports a single challenger that can replace the existing challenger, - // excluding their own address) + // or the current challenger address. + // + // If the given authority is a challenger address, it has the ability to replace itself with another address. string authority = 1 [(gogoproto.moretags) = "yaml:\"authority\"", (cosmos_proto.scalar) = "cosmos.AddressString"]; uint64 bridge_id = 2 [(gogoproto.moretags) = "yaml:\"bridge_id\""]; repeated string new_challengers = 3 [(gogoproto.moretags) = "yaml:\"new_challengers\"", (cosmos_proto.scalar) = "cosmos.AddressString"]; } -// MsgUpdateChallengerResponse returns a message handle result. -message MsgUpdateChallengerResponse { +// MsgUpdateChallengersResponse returns a message handle result. +message MsgUpdateChallengersResponse { // last finalized output index uint64 output_index = 1; // last finalized l2 block number @@ -268,8 +269,10 @@ message MsgUpdateMetadata { option (amino.name) = "ophost/MsgUpdateMetadata"; // authority is the address that controls the module (defaults to x/gov unless overwritten) - // or the current challenger address.(supports a single challenger that can replace the existing challenger, - // excluding their own address)) + // or the current challenger address. + // + // If the given authority is a challenger address, it has the ability to replace oneself to another address or remove + // oneself. string authority = 1 [(gogoproto.moretags) = "yaml:\"authority\"", (cosmos_proto.scalar) = "cosmos.AddressString"]; uint64 bridge_id = 2 [(gogoproto.moretags) = "yaml:\"bridge_id\""]; bytes metadata = 3 [(gogoproto.moretags) = "yaml:\"metadata\""]; diff --git a/proto/opinit/ophost/v1/types.proto b/proto/opinit/ophost/v1/types.proto index c1586ed2..a99edd63 100644 --- a/proto/opinit/ophost/v1/types.proto +++ b/proto/opinit/ophost/v1/types.proto @@ -84,6 +84,6 @@ message Output { // BatchInfoWithOutput defines the batch information with output. message BatchInfoWithOutput { - BatchInfo batchInfo = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; - Output output = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + BatchInfo batch_info = 1 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; + Output output = 2 [(gogoproto.nullable) = false, (amino.dont_omitempty) = true]; } \ No newline at end of file diff --git a/x/opchild/client/cli/tx.go b/x/opchild/client/cli/tx.go index 866cae5e..723e02b0 100644 --- a/x/opchild/client/cli/tx.go +++ b/x/opchild/client/cli/tx.go @@ -261,7 +261,7 @@ func NewSetBridgeInfoCmd(ac address.Codec) *cobra.Command { fmt.Sprintf( `send a tx to set a bridge info with a config file as a json. Example: - $ %s tx ophost set-bridge-info 1 init10d07y265gmmuvt4z0w9aw880jnsr700j55nka3 mahalo-2 07-tendermint-0 path/to/bridge-config.json + $ %s tx opchild set-bridge-info 1 init10d07y265gmmuvt4z0w9aw880jnsr700j55nka3 mahalo-2 07-tendermint-0 path/to/bridge-config.json Where bridge-config.json contains: { @@ -318,7 +318,7 @@ func NewSetBridgeInfoCmd(ac address.Codec) *cobra.Command { } bridgeConfig := ophosttypes.BridgeConfig{ - Challengers: []string{origConfig.Challenger}, + Challengers: origConfig.Challengers, Proposer: origConfig.Proposer, SubmissionInterval: submissionInterval, FinalizationPeriod: finalizationPeriod, diff --git a/x/opchild/client/cli/tx_test.go b/x/opchild/client/cli/tx_test.go index 94ebb511..15e56afb 100644 --- a/x/opchild/client/cli/tx_test.go +++ b/x/opchild/client/cli/tx_test.go @@ -421,7 +421,7 @@ func (s *CLITestSuite) TestNewSetBridgeInfo() { invalidConfig.WriteString(`{}`) validConfig.WriteString(`{ - "challenger": "init1q6jhwnarkw2j5qqgx3qlu20k8nrdglft5ksr0g", + "challengers": ["init1q6jhwnarkw2j5qqgx3qlu20k8nrdglft5ksr0g"], "proposer": "init1k2svyvm60r8rhnzr9vemk5f6fksvm6tyeujp3c", "submission_interval": "100s", "finalization_period": "1000s", diff --git a/x/ophost/client/cli/tx.go b/x/ophost/client/cli/tx.go index 88cde72e..9020ccad 100644 --- a/x/ophost/client/cli/tx.go +++ b/x/ophost/client/cli/tx.go @@ -97,7 +97,7 @@ func NewCreateBridge(ac address.Codec) *cobra.Command { Where bridge-config.json contains: { - "challenger": "bech32-address", + "challengers": ["bech32-address"], "proposer": "bech32-addresss", "submission_interval": "duration", "finalization_period": "duration", @@ -142,7 +142,7 @@ func NewCreateBridge(ac address.Codec) *cobra.Command { } config := types.BridgeConfig{ - Challengers: []string{origConfig.Challenger}, // Ensure Challenger is properly assigned + Challengers: origConfig.Challengers, // Ensure Challenger is properly assigned Proposer: origConfig.Proposer, SubmissionInterval: submissionInterval, FinalizationPeriod: finalizationPeriod, diff --git a/x/ophost/client/cli/tx_test.go b/x/ophost/client/cli/tx_test.go index 4bedc4bd..992b210d 100644 --- a/x/ophost/client/cli/tx_test.go +++ b/x/ophost/client/cli/tx_test.go @@ -164,7 +164,7 @@ func (s *CLITestSuite) TestNewCreateBridge() { invalidConfig.WriteString(`{}`) validConfig.WriteString(`{ - "challenger": "init1q6jhwnarkw2j5qqgx3qlu20k8nrdglft5ksr0g", + "challengers": ["init1q6jhwnarkw2j5qqgx3qlu20k8nrdglft5ksr0g"], "proposer": "init1k2svyvm60r8rhnzr9vemk5f6fksvm6tyeujp3c", "submission_interval": "100s", "finalization_period": "1000s", diff --git a/x/ophost/client/cli/types.go b/x/ophost/client/cli/types.go index e165c531..b6168f16 100644 --- a/x/ophost/client/cli/types.go +++ b/x/ophost/client/cli/types.go @@ -3,7 +3,7 @@ package cli // BridgeConfig defines the set of bridge config. // NOTE: it is a modified BridgeConfig from x/ophost/types/types.go to make unmarshal easier type BridgeCliConfig struct { - Challenger string `json:"challenger"` + Challengers []string `json:"challengers"` Proposer string `json:"proposer"` SubmissionInterval string `json:"submission_interval"` FinalizationPeriod string `json:"finalization_period"` diff --git a/x/ophost/keeper/msg_server.go b/x/ophost/keeper/msg_server.go index f9816e7c..171e2cd6 100644 --- a/x/ophost/keeper/msg_server.go +++ b/x/ophost/keeper/msg_server.go @@ -184,15 +184,9 @@ func (ms MsgServer) DeleteOutput(ctx context.Context, req *types.MsgDeleteOutput if err != nil { return nil, err } - permission := false - for _, c := range bridgeConfig.Challengers { - if c == challenger { - permission = true - break - } - } + // permission check - if !permission { + if !slices.Contains(bridgeConfig.Challengers, challenger) { return nil, errors.ErrUnauthorized.Wrap("invalid challenger") } @@ -436,7 +430,7 @@ func (ms MsgServer) UpdateProposer(ctx context.Context, req *types.MsgUpdateProp }, nil } -func (ms MsgServer) UpdateChallenger(ctx context.Context, req *types.MsgUpdateChallenger) (*types.MsgUpdateChallengerResponse, error) { +func (ms MsgServer) UpdateChallengers(ctx context.Context, req *types.MsgUpdateChallengers) (*types.MsgUpdateChallengersResponse, error) { if err := req.Validate(ms.authKeeper.AddressCodec()); err != nil { return nil, err } @@ -447,23 +441,27 @@ func (ms MsgServer) UpdateChallenger(ctx context.Context, req *types.MsgUpdateCh return nil, err } - if len(req.NewChallengers) == 0 { - return nil, errors.ErrUnauthorized.Wrap("invalid new challengers, at least one new challenger is required") - } + // permission check if req.Authority == ms.authority { - // gov can update multiple challengers config.Challengers = req.NewChallengers - } else if idx := slices.Index(config.Challengers, req.Authority); idx >= 0 { + removedChallengers := []string{} + for _, challenger := range config.Challengers { + if found := slices.Contains(req.NewChallengers, challenger); !found { + removedChallengers = append(removedChallengers, challenger) + } + } - // replace byself - if len(req.NewChallengers) != 1 { - return nil, errors.ErrUnauthorized.Wrap("invalid new challengers, only one new challenger is allowed to replace the old one") + originChallengersLen := len(config.Challengers) + newChallengersLen := len(req.NewChallengers) + removedChallengersLen := len(removedChallengers) + if removedChallengersLen != 1 || removedChallengers[0] != req.Authority || originChallengersLen-newChallengersLen < 0 { + return nil, types.ErrInvalidChallengerUpdate.Wrap("a challenger can replace only oneself or remove oneself") } - config.Challengers[idx] = req.NewChallengers[0] + config.Challengers = req.NewChallengers } else { - return nil, govtypes.ErrInvalidSigner.Wrapf("invalid authority; expected %s or in %s, got %s", ms.authority, config.Challengers, req.Authority) + return nil, govtypes.ErrInvalidSigner.Wrapf("invalid authority; expected %s or one in [%s], but got %s", ms.authority, strings.Join(config.Challengers, ","), req.Authority) } if err := ms.Keeper.bridgeHook.BridgeChallengersUpdated(ctx, bridgeId, config); err != nil { @@ -486,7 +484,7 @@ func (ms MsgServer) UpdateChallenger(ctx context.Context, req *types.MsgUpdateCh sdk.NewAttribute(types.AttributeKeyFinalizedL2BlockNumber, strconv.FormatUint(finalizedOutput.L2BlockNumber, 10)), )) - return &types.MsgUpdateChallengerResponse{ + return &types.MsgUpdateChallengersResponse{ OutputIndex: finalizedOutputIndex, L2BlockNumber: finalizedOutput.L2BlockNumber, }, nil diff --git a/x/ophost/keeper/msg_server_test.go b/x/ophost/keeper/msg_server_test.go index d47d5cc1..4323a77b 100644 --- a/x/ophost/keeper/msg_server_test.go +++ b/x/ophost/keeper/msg_server_test.go @@ -2,7 +2,6 @@ package keeper_test import ( "encoding/hex" - "slices" "testing" "time" @@ -283,13 +282,13 @@ func Test_UpdateProposal(t *testing.T) { require.Error(t, err) } -func Test_UpdateChallenger(t *testing.T) { +func Test_UpdateChallengers(t *testing.T) { ctx, input := createDefaultTestInput(t) ms := keeper.NewMsgServerImpl(input.OPHostKeeper) config := types.BridgeConfig{ Proposer: addrsStr[0], - Challengers: []string{addrsStr[1]}, + Challengers: []string{addrsStr[1], addrsStr[2], addrsStr[3]}, SubmissionInterval: time.Second * 10, FinalizationPeriod: time.Second * 60, SubmissionStartTime: time.Now().UTC(), @@ -303,37 +302,69 @@ func Test_UpdateChallenger(t *testing.T) { // gov signer govAddr, err := input.AccountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov")) require.NoError(t, err) - msg := types.NewMsgUpdateChallenger(govAddr, 1, []string{addrsStr[2], addrsStr[3]}) - _, err = ms.UpdateChallenger(ctx, msg) + msg := types.NewMsgUpdateChallengers(govAddr, 1, []string{addrsStr[2], addrsStr[3]}) + _, err = ms.UpdateChallengers(ctx, msg) require.NoError(t, err) _config, err := ms.GetBridgeConfig(ctx, 1) require.NoError(t, err) - require.True(t, slices.Contains(_config.Challengers, addrsStr[2])) - require.True(t, slices.Contains(input.BridgeHook.challengers, addrsStr[2])) + require.Equal(t, []string{addrsStr[2], addrsStr[3]}, _config.Challengers) + require.Equal(t, input.BridgeHook.challengers, _config.Challengers) + // current challenger - msg = types.NewMsgUpdateChallenger(addrsStr[2], 1, []string{addrsStr[4]}) - _, err = ms.UpdateChallenger(ctx, msg) + + // case 1. replace oneself + msg = types.NewMsgUpdateChallengers(addrsStr[2], 1, []string{addrsStr[3], addrsStr[4]}) + _, err = ms.UpdateChallengers(ctx, msg) require.NoError(t, err) _config, err = ms.GetBridgeConfig(ctx, 1) require.NoError(t, err) - require.True(t, slices.Contains(_config.Challengers, addrsStr[4])) - require.True(t, slices.Contains(input.BridgeHook.challengers, addrsStr[4])) + require.Equal(t, []string{addrsStr[3], addrsStr[4]}, _config.Challengers) + require.Equal(t, input.BridgeHook.challengers, _config.Challengers) + + // case 2. try to remove other challenger + msg = types.NewMsgUpdateChallengers(addrsStr[4], 1, []string{addrsStr[4]}) + _, err = ms.UpdateChallengers(ctx, msg) + require.Error(t, err) + + // case 2. try to replace other challenger + msg = types.NewMsgUpdateChallengers(addrsStr[4], 1, []string{addrsStr[2], addrsStr[4]}) + _, err = ms.UpdateChallengers(ctx, msg) + require.Error(t, err) + + // case 3. remove oneself + msg = types.NewMsgUpdateChallengers(addrsStr[3], 1, []string{addrsStr[4]}) + _, err = ms.UpdateChallengers(ctx, msg) + require.NoError(t, err) + _config, err = ms.GetBridgeConfig(ctx, 1) + require.NoError(t, err) + require.Equal(t, []string{addrsStr[4]}, _config.Challengers) + require.Equal(t, input.BridgeHook.challengers, _config.Challengers) + + // case 4. try to add more challenger + msg = types.NewMsgUpdateChallengers(addrsStr[4], 1, []string{addrsStr[3], addrsStr[4]}) + _, err = ms.UpdateChallengers(ctx, msg) + require.Error(t, err) + + // case 5. try to add more challenger with replace + msg = types.NewMsgUpdateChallengers(addrsStr[4], 1, []string{addrsStr[2], addrsStr[3]}) + _, err = ms.UpdateChallengers(ctx, msg) + require.Error(t, err) // invalid signer invalidAddr, err := input.AccountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress(types.ModuleName)) require.NoError(t, err) - msg = types.NewMsgUpdateChallenger(invalidAddr, 1, []string{addrsStr[1]}) + msg = types.NewMsgUpdateChallengers(invalidAddr, 1, []string{addrsStr[1]}) require.NoError(t, err) - _, err = ms.UpdateChallenger( + _, err = ms.UpdateChallengers( ctx, msg, ) require.Error(t, err) // invalid case - msg = types.NewMsgUpdateChallenger(govAddr, 1, []string{}) - _, err = ms.UpdateChallenger(ctx, msg) + msg = types.NewMsgUpdateChallengers(govAddr, 1, []string{}) + _, err = ms.UpdateChallengers(ctx, msg) require.Error(t, err) } diff --git a/x/ophost/types/bridge_config.go b/x/ophost/types/bridge_config.go index 31aa8a43..1744c00a 100644 --- a/x/ophost/types/bridge_config.go +++ b/x/ophost/types/bridge_config.go @@ -10,11 +10,17 @@ import ( ) func (config BridgeConfig) Validate(ac address.Codec) error { - var err error + challengerDupMap := make(map[string]bool, len(config.Challengers)) for _, challenger := range config.Challengers { - if _, err = ac.StringToBytes(challenger); err != nil { + if _, err := ac.StringToBytes(challenger); err != nil { return err } + + if _, ok := challengerDupMap[challenger]; ok { + return errors.Wrapf(sdkerrors.ErrInvalidRequest, "challengers must be unique") + } + + challengerDupMap[challenger] = true } if _, err := ac.StringToBytes(config.Proposer); err != nil { diff --git a/x/ophost/types/codec.go b/x/ophost/types/codec.go index 542c4bf6..ce6b612c 100644 --- a/x/ophost/types/codec.go +++ b/x/ophost/types/codec.go @@ -18,7 +18,7 @@ func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { legacy.RegisterAminoMsg(cdc, &MsgInitiateTokenDeposit{}, "ophost/MsgInitiateTokenDeposit") legacy.RegisterAminoMsg(cdc, &MsgFinalizeTokenWithdrawal{}, "ophost/MsgFinalizeTokenWithdrawal") legacy.RegisterAminoMsg(cdc, &MsgUpdateProposer{}, "ophost/MsgUpdateProposer") - legacy.RegisterAminoMsg(cdc, &MsgUpdateChallenger{}, "ophost/MsgUpdateChallenger") + legacy.RegisterAminoMsg(cdc, &MsgUpdateChallengers{}, "ophost/MsgUpdateChallengers") legacy.RegisterAminoMsg(cdc, &MsgUpdateBatchInfo{}, "ophost/MsgUpdateBatchInfo") legacy.RegisterAminoMsg(cdc, &MsgUpdateParams{}, "ophost/MsgUpdateParams") @@ -36,7 +36,7 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { &MsgInitiateTokenDeposit{}, &MsgFinalizeTokenWithdrawal{}, &MsgUpdateProposer{}, - &MsgUpdateChallenger{}, + &MsgUpdateChallengers{}, &MsgUpdateBatchInfo{}, &MsgUpdateParams{}, ) diff --git a/x/ophost/types/error.go b/x/ophost/types/error.go index 2025420b..08ed3c6b 100644 --- a/x/ophost/types/error.go +++ b/x/ophost/types/error.go @@ -19,4 +19,5 @@ var ( ErrEmptyBatchInfo = errorsmod.Register(ModuleName, 12, "empty batch info") ErrInvalidBridgeMetadata = errorsmod.Register(ModuleName, 13, "invalid bridge metadata") ErrInvalidBatchInfo = errorsmod.Register(ModuleName, 14, "invalid batch info") + ErrInvalidChallengerUpdate = errorsmod.Register(ModuleName, 15, "invalid challenger update") ) diff --git a/x/ophost/types/genesis.go b/x/ophost/types/genesis.go index 39b3df55..b8a8a14a 100644 --- a/x/ophost/types/genesis.go +++ b/x/ophost/types/genesis.go @@ -72,6 +72,7 @@ func ValidateGenesis(data *GenesisState, ac address.Codec) error { if len(bridge.BatchInfos) == 0 { return ErrEmptyBatchInfo } + // last batchinfo should be same with bridgeconfig batchinfo if bridge.BatchInfos[len(bridge.BatchInfos)-1].BatchInfo != bridge.BridgeConfig.BatchInfo || !bridge.BatchInfos[0].Output.IsEmpty() { diff --git a/x/ophost/types/hook/bridge_hook.go b/x/ophost/types/hook/bridge_hook.go index 9c3470a0..e87a59f1 100644 --- a/x/ophost/types/hook/bridge_hook.go +++ b/x/ophost/types/hook/bridge_hook.go @@ -26,7 +26,7 @@ type ChannelKeeper interface { type PermKeeper interface { HasPermission(ctx context.Context, portID, channelID string, relayer sdk.AccAddress) (bool, error) - SetPermissionedRelayers(ctx context.Context, portID, channelID string, relayer []sdk.AccAddress) error + SetPermissionedRelayers(ctx context.Context, portID, channelID string, relayers []sdk.AccAddress) error } func NewBridgeHook(channelKeeper ChannelKeeper, permKeeper PermKeeper, ac address.Codec) BridgeHook { @@ -43,12 +43,20 @@ func (h BridgeHook) BridgeCreated( return nil } + // TODO (reviewer): This is a temporary solution to allow only one challenger on bridge creation. if len(bridgeConfig.Challengers) != 1 { - return errors.New("only one challenger is allowed on bridge creation") + return errors.New("bridge must have exactly one challenger on creation") + } + + challengers := make([]sdk.AccAddress, len(bridgeConfig.Challengers)) + for i, challenger := range bridgeConfig.Challengers { + challengerAddr, err := h.ac.StringToBytes(challenger) + if err != nil { + return err + } + + challengers[i] = challengerAddr } - challengers := make([]sdk.AccAddress, 1) - challengerStr, _ := h.ac.StringToBytes(bridgeConfig.Challengers[0]) - challengers[0] = challengerStr sdkCtx := sdk.UnwrapSDKContext(ctx) for _, permChannel := range metadata.PermChannels { @@ -58,6 +66,8 @@ func (h BridgeHook) BridgeCreated( } else if seq != 1 { return channeltypes.ErrChannelExists.Wrap("cannot register permissioned relayer for the channel in use") } + + // register challengers as channel relayer if err := h.IBCPermKeeper.SetPermissionedRelayers(sdkCtx, portID, channelID, challengers); err != nil { return err } @@ -76,22 +86,23 @@ func (h BridgeHook) BridgeChallengersUpdated( return nil } - var challengers []sdk.AccAddress - for _, challenger := range bridgeConfig.Challengers { - challenger, err := h.ac.StringToBytes(challenger) + challengers := make([]sdk.AccAddress, len(bridgeConfig.Challengers)) + for i, challenger := range bridgeConfig.Challengers { + challengerAddr, err := h.ac.StringToBytes(challenger) if err != nil { return err } - challengers = append(challengers, challenger) + + challengers[i] = challengerAddr } + sdkCtx := sdk.UnwrapSDKContext(ctx) for _, permChannel := range metadata.PermChannels { portID, channelID := permChannel.PortID, permChannel.ChannelID - // register challenger as channel relayer + // register challengers as channel relayers if err := h.IBCPermKeeper.SetPermissionedRelayers(sdkCtx, portID, channelID, challengers); err != nil { return err } - } return nil @@ -124,36 +135,45 @@ func (h BridgeHook) BridgeMetadataUpdated( return nil } - var challengers []sdk.AccAddress - for _, challenger := range bridgeConfig.Challengers { - challenger, err := h.ac.StringToBytes(challenger) + challengers := make([]sdk.AccAddress, len(bridgeConfig.Challengers)) + for i, challenger := range bridgeConfig.Challengers { + challengerAddr, err := h.ac.StringToBytes(challenger) if err != nil { return err } - challengers = append(challengers, challenger) + + challengers[i] = challengerAddr } sdkCtx := sdk.UnwrapSDKContext(ctx) for _, permChannel := range metadata.PermChannels { portID, channelID := permChannel.PortID, permChannel.ChannelID + + hasPermission := true + + // check if the challengers are already registered as a permissioned relayers for _, challenger := range challengers { - // check if the relayer is already registered as a permissioned relayer - if hasPermission, err := h.IBCPermKeeper.HasPermission(ctx, portID, channelID, challenger); err != nil { + if hasPerm, err := h.IBCPermKeeper.HasPermission(ctx, portID, channelID, challenger); err != nil { return err - } else if hasPermission { - continue + } else if !hasPerm { + hasPermission = false + break } + } - if seq, ok := h.IBCChannelKeeper.GetNextSequenceSend(sdkCtx, portID, channelID); !ok { - return channeltypes.ErrChannelNotFound.Wrap("failed to register permissioned relayer") - } else if seq != 1 { - return channeltypes.ErrChannelExists.Wrap("cannot register permissioned relayer for the channel in use") - } + if hasPermission { + continue + } - // register challenger as channel relayer - if err := h.IBCPermKeeper.SetPermissionedRelayers(sdkCtx, portID, channelID, challengers); err != nil { - return err - } + if seq, ok := h.IBCChannelKeeper.GetNextSequenceSend(sdkCtx, portID, channelID); !ok { + return channeltypes.ErrChannelNotFound.Wrap("failed to register permissioned relayer") + } else if seq != 1 { + return channeltypes.ErrChannelExists.Wrap("cannot register permissioned relayer for the channel in use") + } + + // register challengers as channel relayers + if err := h.IBCPermKeeper.SetPermissionedRelayers(sdkCtx, portID, channelID, challengers); err != nil { + return err } } diff --git a/x/ophost/types/tx.go b/x/ophost/types/tx.go index 6ca4efa5..b91c401c 100644 --- a/x/ophost/types/tx.go +++ b/x/ophost/types/tx.go @@ -13,7 +13,7 @@ var ( _ sdk.Msg = &MsgFinalizeTokenWithdrawal{} _ sdk.Msg = &MsgInitiateTokenDeposit{} _ sdk.Msg = &MsgUpdateProposer{} - _ sdk.Msg = &MsgUpdateChallenger{} + _ sdk.Msg = &MsgUpdateChallengers{} _ sdk.Msg = &MsgUpdateBatchInfo{} _ sdk.Msg = &MsgUpdateMetadata{} _ sdk.Msg = &MsgUpdateParams{} @@ -303,23 +303,23 @@ func (msg MsgUpdateProposer) Validate(accAddressCodec address.Codec) error { return nil } -/* MsgUpdateChallenger */ +/* MsgUpdateChallengers */ -// NewMsgUpdateChallenger creates a new MsgUpdateChallenger instance. -func NewMsgUpdateChallenger( +// NewMsgUpdateChallengers creates a new MsgUpdateChallengers instance. +func NewMsgUpdateChallengers( authority string, bridgeId uint64, newChallengers []string, -) *MsgUpdateChallenger { - return &MsgUpdateChallenger{ +) *MsgUpdateChallengers { + return &MsgUpdateChallengers{ Authority: authority, BridgeId: bridgeId, NewChallengers: newChallengers, } } -// Validate performs basic MsgUpdateChallenger message validation. -func (msg MsgUpdateChallenger) Validate(accAddressCodec address.Codec) error { +// Validate performs basic MsgUpdateChallengers message validation. +func (msg MsgUpdateChallengers) Validate(accAddressCodec address.Codec) error { if _, err := accAddressCodec.StringToBytes(msg.Authority); err != nil { return err } @@ -327,11 +327,23 @@ func (msg MsgUpdateChallenger) Validate(accAddressCodec address.Codec) error { if msg.BridgeId == 0 { return ErrInvalidBridgeId } + + dupCheckMap := make(map[string]bool) for _, challenger := range msg.NewChallengers { _, err := accAddressCodec.StringToBytes(challenger) if err != nil { return err } + + if _, found := dupCheckMap[challenger]; found { + return ErrInvalidChallengerUpdate.Wrap("duplicate challenger") + } + + dupCheckMap[challenger] = true + } + + if len(msg.NewChallengers) == 0 { + return ErrInvalidChallengerUpdate.Wrap("at least one new challenger is required") } return nil diff --git a/x/ophost/types/tx.pb.go b/x/ophost/types/tx.pb.go index 3fa2fee2..9df0390d 100644 --- a/x/ophost/types/tx.pb.go +++ b/x/ophost/types/tx.pb.go @@ -595,27 +595,28 @@ func (m *MsgUpdateProposerResponse) XXX_DiscardUnknown() { var xxx_messageInfo_MsgUpdateProposerResponse proto.InternalMessageInfo // MsgUpdateChallenger is a message to change a challenger -type MsgUpdateChallenger struct { +type MsgUpdateChallengers struct { // authority is the address that controls the module (defaults to x/gov unless overwritten) - // or the current challenger address.(supports a single challenger that can replace the existing challenger, - // excluding their own address) + // or the current challenger address. + // + // If the given authority is a challenger address, it has the ability to replace itself with another address. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty" yaml:"authority"` BridgeId uint64 `protobuf:"varint,2,opt,name=bridge_id,json=bridgeId,proto3" json:"bridge_id,omitempty" yaml:"bridge_id"` NewChallengers []string `protobuf:"bytes,3,rep,name=new_challengers,json=newChallengers,proto3" json:"new_challengers,omitempty" yaml:"new_challengers"` } -func (m *MsgUpdateChallenger) Reset() { *m = MsgUpdateChallenger{} } -func (m *MsgUpdateChallenger) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateChallenger) ProtoMessage() {} -func (*MsgUpdateChallenger) Descriptor() ([]byte, []int) { +func (m *MsgUpdateChallengers) Reset() { *m = MsgUpdateChallengers{} } +func (m *MsgUpdateChallengers) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateChallengers) ProtoMessage() {} +func (*MsgUpdateChallengers) Descriptor() ([]byte, []int) { return fileDescriptor_d16af6eaf4088d05, []int{14} } -func (m *MsgUpdateChallenger) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateChallengers) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateChallenger) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateChallengers) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateChallenger.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateChallengers.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -625,38 +626,38 @@ func (m *MsgUpdateChallenger) XXX_Marshal(b []byte, deterministic bool) ([]byte, return b[:n], nil } } -func (m *MsgUpdateChallenger) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateChallenger.Merge(m, src) +func (m *MsgUpdateChallengers) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateChallengers.Merge(m, src) } -func (m *MsgUpdateChallenger) XXX_Size() int { +func (m *MsgUpdateChallengers) XXX_Size() int { return m.Size() } -func (m *MsgUpdateChallenger) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateChallenger.DiscardUnknown(m) +func (m *MsgUpdateChallengers) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateChallengers.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateChallenger proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateChallengers proto.InternalMessageInfo -// MsgUpdateChallengerResponse returns a message handle result. -type MsgUpdateChallengerResponse struct { +// MsgUpdateChallengersResponse returns a message handle result. +type MsgUpdateChallengersResponse struct { // last finalized output index OutputIndex uint64 `protobuf:"varint,1,opt,name=output_index,json=outputIndex,proto3" json:"output_index,omitempty"` // last finalized l2 block number L2BlockNumber uint64 `protobuf:"varint,2,opt,name=l2_block_number,json=l2BlockNumber,proto3" json:"l2_block_number,omitempty"` } -func (m *MsgUpdateChallengerResponse) Reset() { *m = MsgUpdateChallengerResponse{} } -func (m *MsgUpdateChallengerResponse) String() string { return proto.CompactTextString(m) } -func (*MsgUpdateChallengerResponse) ProtoMessage() {} -func (*MsgUpdateChallengerResponse) Descriptor() ([]byte, []int) { +func (m *MsgUpdateChallengersResponse) Reset() { *m = MsgUpdateChallengersResponse{} } +func (m *MsgUpdateChallengersResponse) String() string { return proto.CompactTextString(m) } +func (*MsgUpdateChallengersResponse) ProtoMessage() {} +func (*MsgUpdateChallengersResponse) Descriptor() ([]byte, []int) { return fileDescriptor_d16af6eaf4088d05, []int{15} } -func (m *MsgUpdateChallengerResponse) XXX_Unmarshal(b []byte) error { +func (m *MsgUpdateChallengersResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *MsgUpdateChallengerResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *MsgUpdateChallengersResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_MsgUpdateChallengerResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_MsgUpdateChallengersResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -666,17 +667,17 @@ func (m *MsgUpdateChallengerResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *MsgUpdateChallengerResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_MsgUpdateChallengerResponse.Merge(m, src) +func (m *MsgUpdateChallengersResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_MsgUpdateChallengersResponse.Merge(m, src) } -func (m *MsgUpdateChallengerResponse) XXX_Size() int { +func (m *MsgUpdateChallengersResponse) XXX_Size() int { return m.Size() } -func (m *MsgUpdateChallengerResponse) XXX_DiscardUnknown() { - xxx_messageInfo_MsgUpdateChallengerResponse.DiscardUnknown(m) +func (m *MsgUpdateChallengersResponse) XXX_DiscardUnknown() { + xxx_messageInfo_MsgUpdateChallengersResponse.DiscardUnknown(m) } -var xxx_messageInfo_MsgUpdateChallengerResponse proto.InternalMessageInfo +var xxx_messageInfo_MsgUpdateChallengersResponse proto.InternalMessageInfo // MsgUpdateBatchInfo is a message to change a batch info type MsgUpdateBatchInfo struct { @@ -764,8 +765,10 @@ var xxx_messageInfo_MsgUpdateBatchInfoResponse proto.InternalMessageInfo // MsgUpdateMetadata is a message to change metadata type MsgUpdateMetadata struct { // authority is the address that controls the module (defaults to x/gov unless overwritten) - // or the current challenger address.(supports a single challenger that can replace the existing challenger, - // excluding their own address)) + // or the current challenger address. + // + // If the given authority is a challenger address, it has the ability to replace oneself to another address or remove + // oneself. Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty" yaml:"authority"` BridgeId uint64 `protobuf:"varint,2,opt,name=bridge_id,json=bridgeId,proto3" json:"bridge_id,omitempty" yaml:"bridge_id"` Metadata []byte `protobuf:"bytes,3,opt,name=metadata,proto3" json:"metadata,omitempty" yaml:"metadata"` @@ -939,8 +942,8 @@ func init() { proto.RegisterType((*MsgFinalizeTokenWithdrawalResponse)(nil), "opinit.ophost.v1.MsgFinalizeTokenWithdrawalResponse") proto.RegisterType((*MsgUpdateProposer)(nil), "opinit.ophost.v1.MsgUpdateProposer") proto.RegisterType((*MsgUpdateProposerResponse)(nil), "opinit.ophost.v1.MsgUpdateProposerResponse") - proto.RegisterType((*MsgUpdateChallenger)(nil), "opinit.ophost.v1.MsgUpdateChallenger") - proto.RegisterType((*MsgUpdateChallengerResponse)(nil), "opinit.ophost.v1.MsgUpdateChallengerResponse") + proto.RegisterType((*MsgUpdateChallengers)(nil), "opinit.ophost.v1.MsgUpdateChallengers") + proto.RegisterType((*MsgUpdateChallengersResponse)(nil), "opinit.ophost.v1.MsgUpdateChallengersResponse") proto.RegisterType((*MsgUpdateBatchInfo)(nil), "opinit.ophost.v1.MsgUpdateBatchInfo") proto.RegisterType((*MsgUpdateBatchInfoResponse)(nil), "opinit.ophost.v1.MsgUpdateBatchInfoResponse") proto.RegisterType((*MsgUpdateMetadata)(nil), "opinit.ophost.v1.MsgUpdateMetadata") @@ -952,108 +955,108 @@ func init() { func init() { proto.RegisterFile("opinit/ophost/v1/tx.proto", fileDescriptor_d16af6eaf4088d05) } var fileDescriptor_d16af6eaf4088d05 = []byte{ - // 1607 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0xcd, 0x6f, 0x13, 0x49, - 0x16, 0xb7, 0x9d, 0x10, 0xe2, 0x72, 0xc8, 0x47, 0x13, 0x12, 0xa7, 0x41, 0xee, 0xa4, 0x16, 0x76, - 0x43, 0x48, 0x6c, 0x25, 0xb0, 0xac, 0x64, 0x89, 0x03, 0x1d, 0xb4, 0x10, 0x24, 0x2f, 0x51, 0xef, - 0xae, 0x56, 0xbb, 0x8b, 0x64, 0xb5, 0xed, 0x4a, 0xbb, 0x85, 0xdd, 0xe5, 0xe9, 0x2a, 0x27, 0x64, - 0xa4, 0x91, 0x46, 0x73, 0x1a, 0xcd, 0x69, 0xa4, 0xf9, 0x07, 0x38, 0x72, 0xe4, 0x30, 0x9a, 0xbf, - 0x21, 0x97, 0x91, 0xd0, 0x68, 0x0e, 0x73, 0xb2, 0x66, 0xe0, 0xc0, 0x9c, 0x46, 0xc8, 0x57, 0x2e, - 0xa3, 0xfa, 0xe8, 0xea, 0x0f, 0xdb, 0x21, 0x44, 0x30, 0x5c, 0xa2, 0xd4, 0x7b, 0xbf, 0x57, 0xf5, - 0xde, 0xef, 0xbd, 0x7e, 0xaf, 0xca, 0x60, 0x09, 0x77, 0x5c, 0xcf, 0xa5, 0x25, 0xdc, 0x69, 0x62, - 0x42, 0x4b, 0xfb, 0x9b, 0x25, 0xfa, 0xb8, 0xd8, 0xf1, 0x31, 0xc5, 0xda, 0xac, 0x50, 0x15, 0x85, - 0xaa, 0xb8, 0xbf, 0xa9, 0xcf, 0xd9, 0x6d, 0xd7, 0xc3, 0x25, 0xfe, 0x57, 0x80, 0xf4, 0x42, 0x1d, - 0x93, 0x36, 0x26, 0xa5, 0x9a, 0x4d, 0x50, 0x69, 0x7f, 0xb3, 0x86, 0xa8, 0xbd, 0x59, 0xaa, 0x63, - 0xd7, 0x93, 0xfa, 0x45, 0xa9, 0x6f, 0x13, 0x87, 0x6d, 0xde, 0x26, 0x8e, 0x54, 0x2c, 0x09, 0x45, - 0x95, 0xaf, 0x4a, 0x62, 0x21, 0x55, 0xf3, 0x0e, 0x76, 0xb0, 0x90, 0xb3, 0xff, 0xa4, 0xf4, 0xd2, - 0xa0, 0xa7, 0x87, 0x1d, 0x24, 0x6d, 0x60, 0x3f, 0x0d, 0xa6, 0x2b, 0xc4, 0xb1, 0x50, 0x1d, 0xfb, - 0x0d, 0xd3, 0xa6, 0xf5, 0xa6, 0x76, 0x1f, 0x64, 0x49, 0xb7, 0xd6, 0x76, 0x29, 0x45, 0x7e, 0x3e, - 0xbd, 0x9c, 0x5e, 0xcd, 0x9a, 0xeb, 0xfd, 0x9e, 0x31, 0x7b, 0x68, 0xb7, 0x5b, 0x65, 0xa8, 0x54, - 0xf0, 0x87, 0x6f, 0x37, 0xe6, 0xe5, 0xf9, 0xb7, 0x1b, 0x0d, 0x1f, 0x11, 0xf2, 0x4f, 0xea, 0xbb, - 0x9e, 0x63, 0x85, 0xe6, 0xda, 0x26, 0xc8, 0xd6, 0x7c, 0xb7, 0xe1, 0xa0, 0xaa, 0xdb, 0xc8, 0x67, - 0x96, 0xd3, 0xab, 0xe3, 0xe6, 0x7c, 0xb8, 0x97, 0x52, 0x41, 0x6b, 0x52, 0xfc, 0xbf, 0xd3, 0xd0, - 0xfe, 0x06, 0x72, 0x35, 0xe6, 0x47, 0xb5, 0x76, 0x48, 0x11, 0xc9, 0x8f, 0x2d, 0xa7, 0x57, 0xa7, - 0xcc, 0x85, 0x7e, 0xcf, 0xd0, 0xa4, 0x51, 0xa8, 0x84, 0x16, 0xe0, 0x2b, 0x93, 0x2d, 0xca, 0xab, - 0x5f, 0xbc, 0x7a, 0xb6, 0x16, 0x9e, 0xfd, 0xd5, 0xab, 0x67, 0x6b, 0x17, 0x64, 0xd0, 0xf1, 0x08, - 0x61, 0x1e, 0x2c, 0xc4, 0x25, 0x16, 0x22, 0x1d, 0xec, 0x11, 0x04, 0x7f, 0x4c, 0x83, 0x99, 0x0a, - 0x71, 0xb6, 0x7d, 0x64, 0x53, 0x64, 0x72, 0x97, 0xb4, 0x3b, 0xe0, 0x6c, 0x9d, 0xad, 0x71, 0xc0, - 0xc6, 0x5a, 0xbf, 0x67, 0x4c, 0x0b, 0x67, 0xa4, 0x62, 0x34, 0x17, 0x81, 0xa9, 0x66, 0x81, 0x89, - 0x3a, 0xf6, 0xf6, 0x5c, 0x87, 0xd3, 0x90, 0xdb, 0x2a, 0x14, 0x93, 0x65, 0x52, 0x14, 0xe7, 0x6d, - 0x73, 0x94, 0xa9, 0x1f, 0xf5, 0x8c, 0x54, 0xbf, 0x67, 0x9c, 0x93, 0x07, 0x71, 0x29, 0x7c, 0xfa, - 0xea, 0xd9, 0x5a, 0xda, 0x92, 0x3b, 0x95, 0xff, 0xc2, 0x22, 0x0e, 0x4e, 0x60, 0xf1, 0x2e, 0x84, - 0xf1, 0x46, 0x43, 0x80, 0x37, 0xc1, 0x62, 0x42, 0x14, 0x44, 0xac, 0x5d, 0x8c, 0x66, 0x88, 0xc5, - 0x37, 0x1e, 0xe6, 0x02, 0x7e, 0x97, 0x01, 0xb3, 0x15, 0xe2, 0xec, 0xfa, 0xb8, 0x83, 0x09, 0x7a, - 0xd0, 0xa5, 0x9d, 0x2e, 0xd5, 0xee, 0x82, 0xc9, 0x8e, 0x10, 0x04, 0x84, 0x5c, 0xeb, 0xf7, 0x8c, - 0x19, 0xe1, 0x67, 0xa0, 0x19, 0xcd, 0x88, 0x32, 0x3e, 0x4d, 0x71, 0x98, 0x60, 0xa6, 0xb5, 0x55, - 0xad, 0xb5, 0x70, 0xfd, 0x51, 0xd5, 0xeb, 0xb6, 0x6b, 0xc8, 0xe7, 0x05, 0x32, 0x6e, 0xea, 0xfd, - 0x9e, 0xb1, 0x20, 0x0c, 0x13, 0x00, 0x68, 0x9d, 0x6b, 0x6d, 0x99, 0x4c, 0xf0, 0x0f, 0xbe, 0x66, - 0x05, 0x86, 0x79, 0x24, 0x55, 0x1f, 0x63, 0x9a, 0x1f, 0x4f, 0x16, 0x58, 0x44, 0x09, 0x2d, 0x20, - 0x56, 0x16, 0xc6, 0xb4, 0x7c, 0x95, 0xd1, 0xad, 0xdc, 0x67, 0x7c, 0x2f, 0x86, 0x7c, 0xc7, 0x38, - 0x82, 0xb7, 0x40, 0x3e, 0x29, 0x53, 0x8c, 0xaf, 0x80, 0x29, 0x79, 0x84, 0xeb, 0x35, 0xd0, 0x63, - 0x49, 0xba, 0xf4, 0x69, 0x87, 0x89, 0xe0, 0x1b, 0x51, 0x86, 0x77, 0x50, 0x0b, 0xd1, 0x80, 0xf6, - 0x0a, 0x00, 0xf5, 0xa6, 0xdd, 0x6a, 0x21, 0xcf, 0x51, 0xc4, 0x6f, 0xf4, 0x7b, 0xc6, 0x9c, 0x2c, - 0x10, 0xa5, 0x1b, 0x4d, 0x7d, 0x64, 0x83, 0xd3, 0x90, 0x5f, 0x4e, 0x38, 0x2e, 0x98, 0x5f, 0xec, - 0xf7, 0x8c, 0xf3, 0x31, 0xe6, 0xb8, 0x16, 0xc6, 0x22, 0x2a, 0xaf, 0x31, 0xee, 0x22, 0xe7, 0x27, - 0xaa, 0x35, 0x1a, 0x29, 0x5c, 0xe2, 0xd5, 0x1a, 0x15, 0xa9, 0xef, 0xf3, 0x4d, 0x86, 0xeb, 0x76, - 0x3c, 0x97, 0xba, 0x36, 0x45, 0xff, 0xc2, 0x8f, 0x90, 0x77, 0x07, 0x75, 0x30, 0x71, 0xa9, 0x76, - 0x1b, 0x4c, 0x10, 0xe4, 0x35, 0x14, 0x39, 0x57, 0xc3, 0xaf, 0x47, 0xc8, 0x47, 0x13, 0x23, 0x0d, - 0x4f, 0x43, 0xca, 0x5f, 0x41, 0x86, 0x62, 0x4e, 0x45, 0xd6, 0xbc, 0xd2, 0xef, 0x19, 0x59, 0x81, - 0xa5, 0x78, 0xf4, 0x69, 0x19, 0x8a, 0xb5, 0x0a, 0x98, 0xb0, 0xdb, 0xb8, 0xeb, 0x89, 0xfa, 0xcb, - 0x6d, 0x2d, 0x15, 0x25, 0x94, 0x0d, 0x84, 0xa2, 0x1c, 0x08, 0xc5, 0x6d, 0xec, 0x7a, 0xc9, 0x4e, - 0x20, 0xcc, 0x82, 0x4e, 0x20, 0x56, 0xda, 0x3a, 0x18, 0x6f, 0xd8, 0xd4, 0xce, 0x9f, 0xe1, 0xc5, - 0x9c, 0x3f, 0xea, 0x19, 0xe9, 0x7e, 0xcf, 0xc8, 0x09, 0x0b, 0xa6, 0xe1, 0xf8, 0x94, 0xc5, 0x51, - 0xe5, 0x9b, 0x5f, 0x3e, 0x31, 0x52, 0xbf, 0x3e, 0x31, 0x52, 0x2c, 0x29, 0x32, 0x76, 0x96, 0x90, - 0x42, 0x98, 0x90, 0x61, 0x0c, 0xc3, 0x5b, 0xc0, 0x18, 0xa1, 0x52, 0xc5, 0xad, 0x83, 0x49, 0x82, - 0x3e, 0xe9, 0x22, 0xaf, 0x8e, 0x82, 0x6e, 0x12, 0xac, 0xe1, 0x6f, 0x67, 0x80, 0x5e, 0x21, 0xce, - 0xdf, 0x5d, 0xcf, 0x6e, 0xb9, 0x9f, 0x0a, 0xfb, 0xff, 0xb8, 0xb4, 0xd9, 0xf0, 0xed, 0x03, 0xbb, - 0xf5, 0x07, 0x57, 0xa4, 0x76, 0x13, 0xcc, 0x1d, 0xa8, 0xc3, 0xd9, 0x38, 0xc5, 0x7b, 0x24, 0x3f, - 0xbe, 0x3c, 0xb6, 0x3a, 0x65, 0x66, 0x19, 0x7f, 0x82, 0xb0, 0xd9, 0x10, 0xb3, 0xcb, 0x21, 0xef, - 0xa3, 0xcc, 0xee, 0x82, 0x49, 0x1f, 0xd5, 0x91, 0xbb, 0x8f, 0x7c, 0x9e, 0xb1, 0x58, 0x07, 0x0d, - 0x34, 0xc7, 0x74, 0xd0, 0x00, 0xa2, 0x95, 0x22, 0x6c, 0x4f, 0xf0, 0xd8, 0xcf, 0x87, 0x1b, 0x29, - 0xde, 0xc3, 0x14, 0x44, 0xca, 0xee, 0xec, 0xfb, 0x29, 0xbb, 0xb3, 0xfb, 0xc8, 0x27, 0x2e, 0xf6, - 0xf2, 0x93, 0xbc, 0xf2, 0xb4, 0x70, 0x34, 0x4a, 0x05, 0xb4, 0x02, 0x88, 0x76, 0x03, 0x00, 0x42, - 0x6d, 0x8a, 0x44, 0xdf, 0xcd, 0x72, 0x83, 0x0b, 0x61, 0x07, 0x0b, 0x75, 0xd0, 0xca, 0xf2, 0x05, - 0xeb, 0xba, 0x2c, 0xc7, 0x84, 0x62, 0xdf, 0x76, 0xa4, 0x1d, 0xe0, 0x76, 0x91, 0x1c, 0x47, 0xb5, - 0xd0, 0xca, 0xc9, 0x25, 0xb7, 0xbd, 0x07, 0xe6, 0x5a, 0x36, 0x45, 0x84, 0xca, 0x89, 0xd0, 0xb4, - 0x49, 0x33, 0x9f, 0xe3, 0x1b, 0x5c, 0xea, 0xf7, 0x8c, 0xbc, 0x1c, 0x18, 0x49, 0x08, 0xb4, 0x66, - 0x84, 0x8c, 0x8f, 0x8d, 0x7b, 0x36, 0x69, 0x96, 0xaf, 0xf3, 0xde, 0x1f, 0x10, 0xcf, 0x3e, 0x96, - 0x95, 0xf0, 0x63, 0x19, 0x51, 0xd1, 0xf0, 0x32, 0x80, 0xa3, 0xb5, 0xaa, 0xa7, 0x7d, 0x93, 0x01, - 0x73, 0x15, 0xe2, 0xfc, 0xbb, 0xd3, 0xb0, 0x29, 0xda, 0x0d, 0x86, 0xe3, 0x7d, 0x90, 0xb5, 0xbb, - 0xb4, 0x89, 0x7d, 0x97, 0x1e, 0x0e, 0xde, 0xc2, 0x94, 0xea, 0x98, 0x5b, 0x98, 0xc2, 0x9c, 0xe6, - 0xcb, 0xb2, 0xc0, 0x94, 0x87, 0x0e, 0xaa, 0x6a, 0xd0, 0x8b, 0x06, 0x57, 0x0a, 0x59, 0x8f, 0x6a, - 0x47, 0x3b, 0x91, 0xf3, 0xd0, 0x41, 0x10, 0x52, 0xf9, 0x1a, 0xbf, 0xa0, 0x29, 0xb7, 0x18, 0x89, - 0xf9, 0x90, 0xc4, 0x78, 0xfc, 0x70, 0x0f, 0x2c, 0x0d, 0x08, 0xdf, 0x61, 0x84, 0x6a, 0x7f, 0x1e, - 0xbc, 0x29, 0xf0, 0xc8, 0x13, 0xb7, 0x01, 0xf8, 0x24, 0x03, 0xce, 0xab, 0x83, 0xb6, 0xc3, 0xf9, - 0xf8, 0x91, 0xf9, 0xff, 0x3f, 0x98, 0x61, 0x0c, 0x87, 0x03, 0x93, 0xdd, 0x84, 0xc7, 0x56, 0xb3, - 0xe6, 0x56, 0x78, 0xd1, 0x49, 0x00, 0x46, 0xbb, 0x32, 0xed, 0xa1, 0x83, 0x30, 0x34, 0x52, 0xde, - 0x18, 0x4c, 0x84, 0x9e, 0x4c, 0x44, 0x88, 0x87, 0x4d, 0x70, 0x71, 0x88, 0xf8, 0x43, 0x24, 0xe3, - 0x69, 0x06, 0x68, 0xea, 0x28, 0x7e, 0x33, 0xdf, 0xf1, 0xf6, 0xf0, 0xc7, 0xce, 0x05, 0x02, 0x8c, - 0xc0, 0xaa, 0x78, 0x78, 0xb8, 0xde, 0x9e, 0x18, 0xf7, 0xb9, 0xad, 0x8b, 0x43, 0xae, 0xf0, 0x81, - 0xcf, 0x26, 0x94, 0xed, 0xf3, 0x42, 0x98, 0xab, 0x70, 0x03, 0xd9, 0x46, 0xd9, 0x27, 0xa6, 0x2c, - 0xca, 0xeb, 0x83, 0x59, 0x59, 0x4a, 0x66, 0x45, 0xa1, 0xa1, 0xc3, 0x67, 0x69, 0x42, 0xfa, 0x21, - 0x72, 0xf2, 0x3a, 0x1d, 0x69, 0x4f, 0x15, 0x44, 0x6d, 0x76, 0x85, 0xf8, 0xd8, 0x29, 0x29, 0x81, - 0xc9, 0xb6, 0x74, 0x45, 0xbe, 0x10, 0x23, 0x83, 0x2f, 0xd0, 0x40, 0x4b, 0x81, 0x4e, 0xd4, 0x7b, - 0x82, 0xe0, 0x62, 0xbd, 0x27, 0x10, 0x7e, 0x08, 0x6a, 0xbf, 0x17, 0xd7, 0x7c, 0xd9, 0xe4, 0x6c, - 0xdf, 0x6e, 0x93, 0xf7, 0x4a, 0xec, 0x36, 0x98, 0xe8, 0xf0, 0x5d, 0xe5, 0x9b, 0x33, 0x3f, 0x58, - 0xb0, 0xe2, 0x54, 0x73, 0x2e, 0x1c, 0xf4, 0xc2, 0x02, 0x5a, 0xd2, 0x54, 0xbc, 0x7a, 0xe2, 0xcc, - 0x2d, 0x0c, 0x74, 0x6d, 0x61, 0x23, 0x2e, 0xee, 0x51, 0x51, 0xc0, 0xda, 0xd6, 0xeb, 0x49, 0x30, - 0x56, 0x21, 0x8e, 0xf6, 0x5f, 0x90, 0x8b, 0xfe, 0xd6, 0xb0, 0x3c, 0xe8, 0x51, 0xfc, 0x65, 0xae, - 0xaf, 0xbe, 0x0d, 0xa1, 0x12, 0xf3, 0x10, 0x4c, 0xc5, 0xde, 0xed, 0x2b, 0x43, 0x2d, 0xa3, 0x10, - 0xfd, 0xea, 0x5b, 0x21, 0x6a, 0xf7, 0x2a, 0x38, 0x17, 0x7f, 0x06, 0xc3, 0xa1, 0xb6, 0x31, 0x8c, - 0xbe, 0xf6, 0x76, 0x4c, 0xd4, 0xfd, 0xd8, 0x7b, 0x6f, 0xb8, 0xfb, 0x51, 0xc8, 0x08, 0xf7, 0x87, - 0x3d, 0x9c, 0x34, 0x0a, 0xe6, 0x87, 0x3e, 0x9a, 0x86, 0x6f, 0x31, 0x0c, 0xaa, 0x6f, 0x9e, 0x18, - 0xaa, 0x4e, 0xfd, 0x0c, 0x2c, 0x8e, 0xba, 0xed, 0xaf, 0x0f, 0xdd, 0x6d, 0x04, 0x5a, 0xbf, 0xf1, - 0x2e, 0x68, 0x75, 0x7c, 0x0d, 0x4c, 0x27, 0x6e, 0x55, 0x7f, 0x1a, 0xba, 0x4f, 0x1c, 0xa4, 0x5f, - 0x3b, 0x01, 0x48, 0x9d, 0xd1, 0x04, 0xb3, 0x03, 0x77, 0x87, 0x2b, 0xc7, 0x6c, 0x10, 0xc2, 0xf4, - 0x8d, 0x13, 0xc1, 0xd4, 0x49, 0x08, 0xcc, 0x24, 0x07, 0xe3, 0xe5, 0x63, 0x76, 0x50, 0x28, 0x7d, - 0xfd, 0x24, 0xa8, 0x41, 0xd2, 0x54, 0xaf, 0x3f, 0x8e, 0xb4, 0x00, 0x74, 0x2c, 0x69, 0x03, 0x3d, - 0xf4, 0x21, 0x98, 0x8a, 0x35, 0xbd, 0x95, 0xe3, 0x18, 0xe7, 0x90, 0x11, 0xb5, 0x3e, 0xac, 0xd7, - 0xe8, 0x67, 0x3e, 0x67, 0xd3, 0xd5, 0xbc, 0x7f, 0xf4, 0x4b, 0x21, 0x75, 0xf4, 0xa2, 0x90, 0x7e, - 0xfe, 0xa2, 0x90, 0xfe, 0xf9, 0x45, 0x21, 0xfd, 0xf5, 0xcb, 0x42, 0xea, 0xf9, 0xcb, 0x42, 0xea, - 0xa7, 0x97, 0x85, 0xd4, 0xff, 0xd6, 0x1d, 0x97, 0x36, 0xbb, 0xb5, 0x62, 0x1d, 0xb7, 0x4b, 0x2e, - 0xaf, 0xe1, 0x8d, 0x96, 0x5d, 0x23, 0xa5, 0x07, 0xbb, 0xfc, 0xd7, 0xd2, 0xc7, 0xc1, 0xef, 0xa5, - 0xfc, 0xc7, 0xd2, 0xda, 0x04, 0xff, 0xb5, 0xf4, 0xfa, 0xef, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfc, - 0x3c, 0x36, 0x79, 0xf7, 0x15, 0x00, 0x00, + // 1609 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x4b, 0x6f, 0x1b, 0x47, + 0x12, 0x26, 0x29, 0x59, 0x16, 0x9b, 0xb2, 0x1e, 0x63, 0x59, 0xa2, 0xc6, 0x06, 0x47, 0xea, 0xf5, + 0x7a, 0x65, 0x59, 0x26, 0x21, 0xd9, 0xeb, 0x05, 0x08, 0xf8, 0xe0, 0x91, 0xb1, 0xb6, 0x0c, 0x70, + 0x2d, 0xcc, 0xee, 0x62, 0xb1, 0x89, 0x01, 0x62, 0x48, 0xb6, 0x86, 0x03, 0x93, 0xd3, 0xcc, 0x74, + 0x53, 0xb2, 0x02, 0x04, 0x08, 0x72, 0x0a, 0x72, 0x0a, 0x90, 0x3f, 0x60, 0xe4, 0xe4, 0xa3, 0x0f, + 0x41, 0x7e, 0x83, 0x2e, 0x01, 0x8c, 0x20, 0x87, 0x9c, 0x88, 0xc4, 0x3e, 0x38, 0xa7, 0x20, 0x60, + 0x8e, 0xbe, 0x04, 0xfd, 0x98, 0x9e, 0x07, 0x49, 0x59, 0x16, 0xec, 0xf8, 0x22, 0xa8, 0xab, 0xbe, + 0xea, 0xae, 0xfa, 0xaa, 0xa6, 0xaa, 0x9b, 0x60, 0x09, 0x77, 0x5c, 0xcf, 0xa5, 0x25, 0xdc, 0x69, + 0x62, 0x42, 0x4b, 0x7b, 0x1b, 0x25, 0xfa, 0xa8, 0xd8, 0xf1, 0x31, 0xc5, 0xda, 0xac, 0x50, 0x15, + 0x85, 0xaa, 0xb8, 0xb7, 0xa1, 0xcf, 0xd9, 0x6d, 0xd7, 0xc3, 0x25, 0xfe, 0x57, 0x80, 0xf4, 0x42, + 0x1d, 0x93, 0x36, 0x26, 0xa5, 0x9a, 0x4d, 0x50, 0x69, 0x6f, 0xa3, 0x86, 0xa8, 0xbd, 0x51, 0xaa, + 0x63, 0xd7, 0x93, 0xfa, 0x45, 0xa9, 0x6f, 0x13, 0x87, 0x6d, 0xde, 0x26, 0x8e, 0x54, 0x2c, 0x09, + 0x45, 0x95, 0xaf, 0x4a, 0x62, 0x21, 0x55, 0xf3, 0x0e, 0x76, 0xb0, 0x90, 0xb3, 0xff, 0xa4, 0xf4, + 0xc2, 0xa0, 0xa7, 0x07, 0x1d, 0x24, 0x6d, 0x60, 0x3f, 0x0d, 0xa6, 0x2b, 0xc4, 0xb1, 0x50, 0x1d, + 0xfb, 0x0d, 0xd3, 0xa6, 0xf5, 0xa6, 0x76, 0x0f, 0x64, 0x49, 0xb7, 0xd6, 0x76, 0x29, 0x45, 0x7e, + 0x3e, 0xbd, 0x9c, 0x5e, 0xcd, 0x9a, 0xeb, 0xfd, 0x9e, 0x31, 0x7b, 0x60, 0xb7, 0x5b, 0x65, 0xa8, + 0x54, 0xf0, 0xfb, 0x6f, 0xae, 0xce, 0xcb, 0xf3, 0x6f, 0x35, 0x1a, 0x3e, 0x22, 0xe4, 0xdf, 0xd4, + 0x77, 0x3d, 0xc7, 0x0a, 0xcd, 0xb5, 0x0d, 0x90, 0xad, 0xf9, 0x6e, 0xc3, 0x41, 0x55, 0xb7, 0x91, + 0xcf, 0x2c, 0xa7, 0x57, 0xc7, 0xcd, 0xf9, 0x70, 0x2f, 0xa5, 0x82, 0xd6, 0xa4, 0xf8, 0x7f, 0xbb, + 0xa1, 0xfd, 0x03, 0xe4, 0x6a, 0xcc, 0x8f, 0x6a, 0xed, 0x80, 0x22, 0x92, 0x1f, 0x5b, 0x4e, 0xaf, + 0x4e, 0x99, 0x0b, 0xfd, 0x9e, 0xa1, 0x49, 0xa3, 0x50, 0x09, 0x2d, 0xc0, 0x57, 0x26, 0x5b, 0x94, + 0x57, 0x3f, 0x7b, 0xf9, 0x74, 0x2d, 0x3c, 0xfb, 0x8b, 0x97, 0x4f, 0xd7, 0xce, 0xc9, 0xa0, 0xe3, + 0x11, 0xc2, 0x3c, 0x58, 0x88, 0x4b, 0x2c, 0x44, 0x3a, 0xd8, 0x23, 0x08, 0xfe, 0x90, 0x06, 0x33, + 0x15, 0xe2, 0x6c, 0xf9, 0xc8, 0xa6, 0xc8, 0xe4, 0x2e, 0x69, 0xb7, 0xc1, 0xe9, 0x3a, 0x5b, 0xe3, + 0x80, 0x8d, 0xb5, 0x7e, 0xcf, 0x98, 0x16, 0xce, 0x48, 0xc5, 0x68, 0x2e, 0x02, 0x53, 0xcd, 0x02, + 0x13, 0x75, 0xec, 0xed, 0xba, 0x0e, 0xa7, 0x21, 0xb7, 0x59, 0x28, 0x26, 0xcb, 0xa4, 0x28, 0xce, + 0xdb, 0xe2, 0x28, 0x53, 0x3f, 0xec, 0x19, 0xa9, 0x7e, 0xcf, 0x38, 0x23, 0x0f, 0xe2, 0x52, 0xf8, + 0xe4, 0xe5, 0xd3, 0xb5, 0xb4, 0x25, 0x77, 0x2a, 0xff, 0x8d, 0x45, 0x1c, 0x9c, 0xc0, 0xe2, 0x5d, + 0x08, 0xe3, 0x8d, 0x86, 0x00, 0x6f, 0x80, 0xc5, 0x84, 0x28, 0x88, 0x58, 0x3b, 0x1f, 0xcd, 0x10, + 0x8b, 0x6f, 0x3c, 0xcc, 0x05, 0xfc, 0x36, 0x03, 0x66, 0x2b, 0xc4, 0xd9, 0xf1, 0x71, 0x07, 0x13, + 0x74, 0xbf, 0x4b, 0x3b, 0x5d, 0xaa, 0xdd, 0x01, 0x93, 0x1d, 0x21, 0x08, 0x08, 0xb9, 0xd2, 0xef, + 0x19, 0x33, 0xc2, 0xcf, 0x40, 0x33, 0x9a, 0x11, 0x65, 0x7c, 0x92, 0xe2, 0x30, 0xc1, 0x4c, 0x6b, + 0xb3, 0x5a, 0x6b, 0xe1, 0xfa, 0xc3, 0xaa, 0xd7, 0x6d, 0xd7, 0x90, 0xcf, 0x0b, 0x64, 0xdc, 0xd4, + 0xfb, 0x3d, 0x63, 0x41, 0x18, 0x26, 0x00, 0xd0, 0x3a, 0xd3, 0xda, 0x34, 0x99, 0xe0, 0x5f, 0x7c, + 0xcd, 0x0a, 0x0c, 0xf3, 0x48, 0xaa, 0x3e, 0xc6, 0x34, 0x3f, 0x9e, 0x2c, 0xb0, 0x88, 0x12, 0x5a, + 0x40, 0xac, 0x2c, 0x8c, 0x69, 0xf9, 0x32, 0xa3, 0x5b, 0xb9, 0xcf, 0xf8, 0x5e, 0x0c, 0xf9, 0x8e, + 0x71, 0x04, 0x6f, 0x82, 0x7c, 0x52, 0xa6, 0x18, 0x5f, 0x01, 0x53, 0xf2, 0x08, 0xd7, 0x6b, 0xa0, + 0x47, 0x92, 0x74, 0xe9, 0xd3, 0x36, 0x13, 0xc1, 0x57, 0xa2, 0x0c, 0x6f, 0xa3, 0x16, 0xa2, 0x01, + 0xed, 0x15, 0x00, 0xea, 0x4d, 0xbb, 0xd5, 0x42, 0x9e, 0xa3, 0x88, 0xbf, 0xda, 0xef, 0x19, 0x73, + 0xb2, 0x40, 0x94, 0x6e, 0x34, 0xf5, 0x91, 0x0d, 0x4e, 0x42, 0x7e, 0x39, 0xe1, 0xb8, 0x60, 0x7e, + 0xb1, 0xdf, 0x33, 0xce, 0xc6, 0x98, 0xe3, 0x5a, 0x18, 0x8b, 0xa8, 0xbc, 0xc6, 0xb8, 0x8b, 0x9c, + 0x9f, 0xa8, 0xd6, 0x68, 0xa4, 0x70, 0x89, 0x57, 0x6b, 0x54, 0xa4, 0xbe, 0xcf, 0x57, 0x19, 0xae, + 0xdb, 0xf6, 0x5c, 0xea, 0xda, 0x14, 0xfd, 0x07, 0x3f, 0x44, 0xde, 0x6d, 0xd4, 0xc1, 0xc4, 0xa5, + 0xda, 0x2d, 0x30, 0x41, 0x90, 0xd7, 0x50, 0xe4, 0x5c, 0x0e, 0xbf, 0x1e, 0x21, 0x1f, 0x4d, 0x8c, + 0x34, 0x3c, 0x09, 0x29, 0x7f, 0x07, 0x19, 0x8a, 0x39, 0x15, 0x59, 0xf3, 0xaf, 0xfd, 0x9e, 0x91, + 0x15, 0x58, 0x8a, 0x47, 0x9f, 0x96, 0xa1, 0x58, 0xab, 0x80, 0x09, 0xbb, 0x8d, 0xbb, 0x9e, 0xa8, + 0xbf, 0xdc, 0xe6, 0x52, 0x51, 0x42, 0xd9, 0x40, 0x28, 0xca, 0x81, 0x50, 0xdc, 0xc2, 0xae, 0x97, + 0xec, 0x04, 0xc2, 0x2c, 0xe8, 0x04, 0x62, 0xa5, 0xad, 0x83, 0xf1, 0x86, 0x4d, 0xed, 0xfc, 0x29, + 0x5e, 0xcc, 0xf9, 0xc3, 0x9e, 0x91, 0xee, 0xf7, 0x8c, 0x9c, 0xb0, 0x60, 0x1a, 0x8e, 0x4f, 0x59, + 0x1c, 0x55, 0xbe, 0xf1, 0xf9, 0x63, 0x23, 0xf5, 0xcb, 0x63, 0x23, 0xc5, 0x92, 0x22, 0x63, 0x67, + 0x09, 0x29, 0x84, 0x09, 0x19, 0xc6, 0x30, 0xbc, 0x09, 0x8c, 0x11, 0x2a, 0x55, 0xdc, 0x3a, 0x98, + 0x24, 0xe8, 0xa3, 0x2e, 0xf2, 0xea, 0x28, 0xe8, 0x26, 0xc1, 0x1a, 0xfe, 0x7a, 0x0a, 0xe8, 0x15, + 0xe2, 0xfc, 0xd3, 0xf5, 0xec, 0x96, 0xfb, 0xb1, 0xb0, 0xff, 0x9f, 0x4b, 0x9b, 0x0d, 0xdf, 0xde, + 0xb7, 0x5b, 0x7f, 0x72, 0x45, 0x6a, 0x37, 0xc0, 0xdc, 0xbe, 0x3a, 0x9c, 0x8d, 0x53, 0xbc, 0x4b, + 0xf2, 0xe3, 0xcb, 0x63, 0xab, 0x53, 0x66, 0x96, 0xf1, 0x27, 0x08, 0x9b, 0x0d, 0x31, 0x3b, 0x1c, + 0xf2, 0x36, 0xca, 0xec, 0x0e, 0x98, 0xf4, 0x51, 0x1d, 0xb9, 0x7b, 0xc8, 0xe7, 0x19, 0x8b, 0x75, + 0xd0, 0x40, 0x73, 0x44, 0x07, 0x0d, 0x20, 0x5a, 0x29, 0xc2, 0xf6, 0x04, 0x8f, 0xfd, 0x6c, 0xb8, + 0x91, 0xe2, 0x3d, 0x4c, 0x41, 0xa4, 0xec, 0x4e, 0xbf, 0x9d, 0xb2, 0x3b, 0xbd, 0x87, 0x7c, 0xe2, + 0x62, 0x2f, 0x3f, 0xc9, 0x2b, 0x4f, 0x0b, 0x47, 0xa3, 0x54, 0x40, 0x2b, 0x80, 0x68, 0xd7, 0x01, + 0x20, 0xd4, 0xa6, 0x48, 0xf4, 0xdd, 0x2c, 0x37, 0x38, 0x17, 0x76, 0xb0, 0x50, 0x07, 0xad, 0x2c, + 0x5f, 0xb0, 0xae, 0xcb, 0x72, 0x4c, 0x28, 0xf6, 0x6d, 0x47, 0xda, 0x01, 0x6e, 0x17, 0xc9, 0x71, + 0x54, 0x0b, 0xad, 0x9c, 0x5c, 0x72, 0xdb, 0xbb, 0x60, 0xae, 0x65, 0x53, 0x44, 0xa8, 0x9c, 0x08, + 0x4d, 0x9b, 0x34, 0xf3, 0x39, 0xbe, 0xc1, 0x85, 0x7e, 0xcf, 0xc8, 0xcb, 0x81, 0x91, 0x84, 0x40, + 0x6b, 0x46, 0xc8, 0xf8, 0xd8, 0xb8, 0x6b, 0x93, 0x66, 0xf9, 0x1a, 0xef, 0xfd, 0x01, 0xf1, 0xec, + 0x63, 0x59, 0x09, 0x3f, 0x96, 0x11, 0x15, 0x0d, 0x2f, 0x02, 0x38, 0x5a, 0xab, 0x7a, 0xda, 0x57, + 0x19, 0x30, 0x57, 0x21, 0xce, 0x7f, 0x3b, 0x0d, 0x9b, 0xa2, 0x9d, 0x60, 0x38, 0xde, 0x03, 0x59, + 0xbb, 0x4b, 0x9b, 0xd8, 0x77, 0xe9, 0xc1, 0xe0, 0x2d, 0x4c, 0xa9, 0x8e, 0xb8, 0x85, 0x29, 0xcc, + 0x49, 0xbe, 0x2c, 0x0b, 0x4c, 0x79, 0x68, 0xbf, 0xaa, 0x06, 0xbd, 0x68, 0x70, 0xa5, 0x90, 0xf5, + 0xa8, 0x76, 0xb4, 0x13, 0x39, 0x0f, 0xed, 0x07, 0x21, 0x95, 0xaf, 0xf0, 0x0b, 0x9a, 0x72, 0x8b, + 0x91, 0x98, 0x0f, 0x49, 0x8c, 0xc7, 0x0f, 0x77, 0xc1, 0xd2, 0x80, 0xf0, 0x0d, 0x46, 0xa8, 0x76, + 0x69, 0xf0, 0xa6, 0xc0, 0x23, 0x4f, 0xdc, 0x06, 0xe0, 0xd7, 0x19, 0x30, 0xaf, 0x0e, 0xda, 0x52, + 0xf3, 0x89, 0xbc, 0xef, 0x04, 0x7c, 0x08, 0x66, 0x18, 0xc5, 0xe1, 0xc4, 0x64, 0x57, 0xe1, 0xb1, + 0xd5, 0xac, 0xb9, 0x19, 0xde, 0x74, 0x12, 0x80, 0xd1, 0xae, 0x4c, 0x7b, 0x68, 0x3f, 0x12, 0x5b, + 0xb9, 0x38, 0x98, 0x89, 0xf3, 0xc9, 0x4c, 0x44, 0xf0, 0xd0, 0x05, 0x17, 0x86, 0xc9, 0xdf, 0x45, + 0x3e, 0x9e, 0x64, 0x80, 0xa6, 0xce, 0xe2, 0x97, 0xf3, 0x6d, 0x6f, 0x17, 0xbf, 0xef, 0x6c, 0x20, + 0xc0, 0x28, 0xac, 0x8a, 0xb7, 0x87, 0xeb, 0xed, 0x8a, 0x89, 0x9f, 0xdb, 0x3c, 0x3f, 0xe4, 0x16, + 0x1f, 0xf8, 0x6c, 0x42, 0xd9, 0x41, 0xcf, 0x85, 0xd9, 0x0a, 0x37, 0x90, 0x9d, 0x94, 0x7d, 0x65, + 0xca, 0xa2, 0xbc, 0x3e, 0x98, 0x97, 0xa5, 0x64, 0x5e, 0x14, 0x1a, 0x3a, 0x7c, 0x9c, 0x26, 0xa4, + 0xef, 0x22, 0x27, 0xbf, 0xa5, 0x23, 0x1d, 0xaa, 0x82, 0xa8, 0xcd, 0x6e, 0x11, 0xef, 0x3b, 0x25, + 0x25, 0x30, 0xd9, 0x96, 0xae, 0xc8, 0x47, 0x62, 0x64, 0xf6, 0x05, 0x1a, 0x68, 0x29, 0xd0, 0xb1, + 0xda, 0x4f, 0x10, 0x5c, 0xac, 0xfd, 0x04, 0xc2, 0x77, 0x41, 0xed, 0x77, 0xe2, 0xa6, 0x2f, 0xfb, + 0x9c, 0xed, 0xdb, 0xed, 0xb7, 0xdb, 0x79, 0xb6, 0xc0, 0x44, 0x87, 0xef, 0x2a, 0x9f, 0x9d, 0xf9, + 0xc1, 0x82, 0x15, 0xa7, 0x9a, 0x73, 0xe1, 0xac, 0x17, 0x16, 0xd0, 0x92, 0xa6, 0xe2, 0xe1, 0x13, + 0x67, 0x6e, 0x61, 0xa0, 0x71, 0x0b, 0x1b, 0x71, 0x77, 0x8f, 0x8a, 0x02, 0xd6, 0x36, 0x7f, 0x9f, + 0x04, 0x63, 0x15, 0xe2, 0x68, 0xff, 0x07, 0xb9, 0xe8, 0xcf, 0x0d, 0xcb, 0x83, 0x1e, 0xc5, 0x1f, + 0xe7, 0xfa, 0xea, 0xeb, 0x10, 0x2a, 0x31, 0x0f, 0xc0, 0x54, 0xec, 0xe9, 0xbe, 0x32, 0xd4, 0x32, + 0x0a, 0xd1, 0x2f, 0xbf, 0x16, 0xa2, 0x76, 0xaf, 0x82, 0x33, 0xf1, 0x97, 0x30, 0x1c, 0x6a, 0x1b, + 0xc3, 0xe8, 0x6b, 0xaf, 0xc7, 0x44, 0xdd, 0x8f, 0x3d, 0xf9, 0x86, 0xbb, 0x1f, 0x85, 0x8c, 0x70, + 0x7f, 0xd8, 0xdb, 0x49, 0xa3, 0x60, 0x7e, 0xe8, 0xbb, 0x69, 0xf8, 0x16, 0xc3, 0xa0, 0xfa, 0xc6, + 0xb1, 0xa1, 0xea, 0xd4, 0x4f, 0xc0, 0xe2, 0xa8, 0x0b, 0xff, 0xfa, 0xd0, 0xdd, 0x46, 0xa0, 0xf5, + 0xeb, 0x6f, 0x82, 0x56, 0xc7, 0xd7, 0xc0, 0x74, 0xe2, 0x62, 0xf5, 0x97, 0xa1, 0xfb, 0xc4, 0x41, + 0xfa, 0x95, 0x63, 0x80, 0xd4, 0x19, 0x0f, 0xc1, 0xdc, 0xe0, 0xf5, 0xe1, 0xd2, 0x11, 0x3b, 0x44, + 0x70, 0x7a, 0xf1, 0x78, 0x38, 0x75, 0x18, 0x02, 0x33, 0xc9, 0xd9, 0x78, 0xf1, 0x88, 0x2d, 0x14, + 0x4a, 0x5f, 0x3f, 0x0e, 0x6a, 0x90, 0x37, 0xd5, 0xee, 0x8f, 0xe2, 0x2d, 0x00, 0x1d, 0xc9, 0xdb, + 0x40, 0x1b, 0x7d, 0x00, 0xa6, 0x62, 0x7d, 0x6f, 0xe5, 0x28, 0xd2, 0x39, 0x64, 0x44, 0xb9, 0x0f, + 0x6b, 0x37, 0xfa, 0xa9, 0x4f, 0xd9, 0x80, 0x35, 0xef, 0x1d, 0xfe, 0x5c, 0x48, 0x1d, 0x3e, 0x2f, + 0xa4, 0x9f, 0x3d, 0x2f, 0xa4, 0x7f, 0x7a, 0x5e, 0x48, 0x7f, 0xf9, 0xa2, 0x90, 0x7a, 0xf6, 0xa2, + 0x90, 0xfa, 0xf1, 0x45, 0x21, 0xf5, 0xc1, 0xba, 0xe3, 0xd2, 0x66, 0xb7, 0x56, 0xac, 0xe3, 0x76, + 0xc9, 0xe5, 0x65, 0x7c, 0xb5, 0x65, 0xd7, 0x48, 0xe9, 0xfe, 0x0e, 0xff, 0xcd, 0xf4, 0x51, 0xf0, + 0xab, 0x29, 0xff, 0xc9, 0xb4, 0x36, 0xc1, 0x7f, 0x33, 0xbd, 0xf6, 0x47, 0x00, 0x00, 0x00, 0xff, + 0xff, 0xe0, 0xb1, 0xfd, 0x21, 0xfd, 0x15, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1082,8 +1085,8 @@ type MsgClient interface { FinalizeTokenWithdrawal(ctx context.Context, in *MsgFinalizeTokenWithdrawal, opts ...grpc.CallOption) (*MsgFinalizeTokenWithdrawalResponse, error) // UpdateProposer defines a rpc handler method for MsgUpdateProposer. UpdateProposer(ctx context.Context, in *MsgUpdateProposer, opts ...grpc.CallOption) (*MsgUpdateProposerResponse, error) - // UpdateChallenger defines a rpc handler method for MsgUpdateChallenger. - UpdateChallenger(ctx context.Context, in *MsgUpdateChallenger, opts ...grpc.CallOption) (*MsgUpdateChallengerResponse, error) + // UpdateChallengers defines a rpc handler method for MsgUpdateChallengers. + UpdateChallengers(ctx context.Context, in *MsgUpdateChallengers, opts ...grpc.CallOption) (*MsgUpdateChallengersResponse, error) // UpdateBatchInfo defines a rpc handler method for MsgUpdateBatchInfo. UpdateBatchInfo(ctx context.Context, in *MsgUpdateBatchInfo, opts ...grpc.CallOption) (*MsgUpdateBatchInfoResponse, error) // UpdateMetadata defines a rpc handler method for MsgUpdateMetadata. @@ -1164,9 +1167,9 @@ func (c *msgClient) UpdateProposer(ctx context.Context, in *MsgUpdateProposer, o return out, nil } -func (c *msgClient) UpdateChallenger(ctx context.Context, in *MsgUpdateChallenger, opts ...grpc.CallOption) (*MsgUpdateChallengerResponse, error) { - out := new(MsgUpdateChallengerResponse) - err := c.cc.Invoke(ctx, "/opinit.ophost.v1.Msg/UpdateChallenger", in, out, opts...) +func (c *msgClient) UpdateChallengers(ctx context.Context, in *MsgUpdateChallengers, opts ...grpc.CallOption) (*MsgUpdateChallengersResponse, error) { + out := new(MsgUpdateChallengersResponse) + err := c.cc.Invoke(ctx, "/opinit.ophost.v1.Msg/UpdateChallengers", in, out, opts...) if err != nil { return nil, err } @@ -1216,8 +1219,8 @@ type MsgServer interface { FinalizeTokenWithdrawal(context.Context, *MsgFinalizeTokenWithdrawal) (*MsgFinalizeTokenWithdrawalResponse, error) // UpdateProposer defines a rpc handler method for MsgUpdateProposer. UpdateProposer(context.Context, *MsgUpdateProposer) (*MsgUpdateProposerResponse, error) - // UpdateChallenger defines a rpc handler method for MsgUpdateChallenger. - UpdateChallenger(context.Context, *MsgUpdateChallenger) (*MsgUpdateChallengerResponse, error) + // UpdateChallengers defines a rpc handler method for MsgUpdateChallengers. + UpdateChallengers(context.Context, *MsgUpdateChallengers) (*MsgUpdateChallengersResponse, error) // UpdateBatchInfo defines a rpc handler method for MsgUpdateBatchInfo. UpdateBatchInfo(context.Context, *MsgUpdateBatchInfo) (*MsgUpdateBatchInfoResponse, error) // UpdateMetadata defines a rpc handler method for MsgUpdateMetadata. @@ -1252,8 +1255,8 @@ func (*UnimplementedMsgServer) FinalizeTokenWithdrawal(ctx context.Context, req func (*UnimplementedMsgServer) UpdateProposer(ctx context.Context, req *MsgUpdateProposer) (*MsgUpdateProposerResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateProposer not implemented") } -func (*UnimplementedMsgServer) UpdateChallenger(ctx context.Context, req *MsgUpdateChallenger) (*MsgUpdateChallengerResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method UpdateChallenger not implemented") +func (*UnimplementedMsgServer) UpdateChallengers(ctx context.Context, req *MsgUpdateChallengers) (*MsgUpdateChallengersResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method UpdateChallengers not implemented") } func (*UnimplementedMsgServer) UpdateBatchInfo(ctx context.Context, req *MsgUpdateBatchInfo) (*MsgUpdateBatchInfoResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method UpdateBatchInfo not implemented") @@ -1395,20 +1398,20 @@ func _Msg_UpdateProposer_Handler(srv interface{}, ctx context.Context, dec func( return interceptor(ctx, in, info, handler) } -func _Msg_UpdateChallenger_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MsgUpdateChallenger) +func _Msg_UpdateChallengers_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(MsgUpdateChallengers) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(MsgServer).UpdateChallenger(ctx, in) + return srv.(MsgServer).UpdateChallengers(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/opinit.ophost.v1.Msg/UpdateChallenger", + FullMethod: "/opinit.ophost.v1.Msg/UpdateChallengers", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(MsgServer).UpdateChallenger(ctx, req.(*MsgUpdateChallenger)) + return srv.(MsgServer).UpdateChallengers(ctx, req.(*MsgUpdateChallengers)) } return interceptor(ctx, in, info, handler) } @@ -1500,8 +1503,8 @@ var _Msg_serviceDesc = grpc.ServiceDesc{ Handler: _Msg_UpdateProposer_Handler, }, { - MethodName: "UpdateChallenger", - Handler: _Msg_UpdateChallenger_Handler, + MethodName: "UpdateChallengers", + Handler: _Msg_UpdateChallengers_Handler, }, { MethodName: "UpdateBatchInfo", @@ -2075,7 +2078,7 @@ func (m *MsgUpdateProposerResponse) MarshalToSizedBuffer(dAtA []byte) (int, erro return len(dAtA) - i, nil } -func (m *MsgUpdateChallenger) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateChallengers) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2085,12 +2088,12 @@ func (m *MsgUpdateChallenger) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateChallenger) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateChallengers) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateChallenger) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateChallengers) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2119,7 +2122,7 @@ func (m *MsgUpdateChallenger) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *MsgUpdateChallengerResponse) Marshal() (dAtA []byte, err error) { +func (m *MsgUpdateChallengersResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2129,12 +2132,12 @@ func (m *MsgUpdateChallengerResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *MsgUpdateChallengerResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *MsgUpdateChallengersResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *MsgUpdateChallengerResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *MsgUpdateChallengersResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2632,7 +2635,7 @@ func (m *MsgUpdateProposerResponse) Size() (n int) { return n } -func (m *MsgUpdateChallenger) Size() (n int) { +func (m *MsgUpdateChallengers) Size() (n int) { if m == nil { return 0 } @@ -2654,7 +2657,7 @@ func (m *MsgUpdateChallenger) Size() (n int) { return n } -func (m *MsgUpdateChallengerResponse) Size() (n int) { +func (m *MsgUpdateChallengersResponse) Size() (n int) { if m == nil { return 0 } @@ -4443,7 +4446,7 @@ func (m *MsgUpdateProposerResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateChallenger) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateChallengers) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4466,10 +4469,10 @@ func (m *MsgUpdateChallenger) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateChallenger: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateChallengers: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateChallenger: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateChallengers: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -4576,7 +4579,7 @@ func (m *MsgUpdateChallenger) Unmarshal(dAtA []byte) error { } return nil } -func (m *MsgUpdateChallengerResponse) Unmarshal(dAtA []byte) error { +func (m *MsgUpdateChallengersResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4599,10 +4602,10 @@ func (m *MsgUpdateChallengerResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: MsgUpdateChallengerResponse: wiretype end group for non-group") + return fmt.Errorf("proto: MsgUpdateChallengersResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: MsgUpdateChallengerResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: MsgUpdateChallengersResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: diff --git a/x/ophost/types/types.pb.go b/x/ophost/types/types.pb.go index be64fe13..b8baf0c3 100644 --- a/x/ophost/types/types.pb.go +++ b/x/ophost/types/types.pb.go @@ -249,7 +249,7 @@ var xxx_messageInfo_Output proto.InternalMessageInfo // BatchInfoWithOutput defines the batch information with output. type BatchInfoWithOutput struct { - BatchInfo BatchInfo `protobuf:"bytes,1,opt,name=batchInfo,proto3" json:"batchInfo"` + BatchInfo BatchInfo `protobuf:"bytes,1,opt,name=batch_info,json=batchInfo,proto3" json:"batch_info"` Output Output `protobuf:"bytes,2,opt,name=output,proto3" json:"output"` } @@ -299,55 +299,55 @@ func init() { proto.RegisterFile("opinit/ophost/v1/types.proto", fileDescriptor_ var fileDescriptor_29cadbd84ee898dd = []byte{ // 776 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4d, 0x4f, 0xeb, 0x46, - 0x14, 0x8d, 0x79, 0xbc, 0x3c, 0x32, 0x21, 0x7a, 0xaf, 0x86, 0x4a, 0x4e, 0x4a, 0xed, 0x28, 0x8b, - 0x2a, 0x42, 0x60, 0xcb, 0x69, 0xbb, 0xa1, 0x8b, 0x0a, 0x43, 0x2b, 0xb1, 0x28, 0x44, 0x06, 0xa9, - 0x52, 0xa5, 0x2a, 0x1a, 0xc7, 0x13, 0x67, 0x84, 0xed, 0xb1, 0x66, 0x26, 0x51, 0xa1, 0xff, 0xa0, - 0x2b, 0x96, 0x2c, 0xe9, 0x0e, 0x75, 0xc5, 0xa2, 0xab, 0xfe, 0x02, 0x96, 0xa8, 0xab, 0xae, 0xa0, - 0x0d, 0x0b, 0xaa, 0xfe, 0x8a, 0x6a, 0x3e, 0x12, 0x22, 0x40, 0x55, 0xdb, 0x4d, 0xe2, 0xb9, 0xf7, - 0xdc, 0x7b, 0xce, 0x9c, 0x7b, 0x35, 0x60, 0x8d, 0x14, 0x38, 0xc7, 0xdc, 0x23, 0xc5, 0x90, 0x30, - 0xee, 0x8d, 0x7d, 0x8f, 0x9f, 0x14, 0x88, 0xb9, 0x05, 0x25, 0x9c, 0x98, 0xef, 0x54, 0xd6, 0x55, - 0x59, 0x77, 0xec, 0x37, 0xde, 0x83, 0x19, 0xce, 0x89, 0x27, 0x7f, 0x15, 0xa8, 0x61, 0xf7, 0x09, - 0xcb, 0x08, 0xf3, 0x22, 0xc8, 0x90, 0x37, 0xf6, 0x23, 0xc4, 0xa1, 0xef, 0xf5, 0x09, 0xce, 0x75, - 0xbe, 0xae, 0xf2, 0x3d, 0x79, 0xf2, 0xd4, 0x41, 0xa7, 0x56, 0x13, 0x92, 0x10, 0x15, 0x17, 0x5f, - 0x3a, 0xea, 0x24, 0x84, 0x24, 0x29, 0xf2, 0xe4, 0x29, 0x1a, 0x0d, 0x3c, 0x8e, 0x33, 0xc4, 0x38, - 0xcc, 0x8a, 0x29, 0xe3, 0x53, 0x40, 0x3c, 0xa2, 0x90, 0x63, 0xa2, 0x19, 0x5b, 0x3f, 0x1a, 0xa0, - 0xdc, 0x85, 0x14, 0x66, 0xcc, 0xfc, 0x1e, 0xbc, 0xa3, 0x28, 0xc1, 0x8c, 0x2b, 0x40, 0x6f, 0x80, - 0x90, 0x65, 0x34, 0x5f, 0xb5, 0xab, 0x9d, 0xba, 0xab, 0xa5, 0x08, 0xdd, 0xae, 0xd6, 0xed, 0xee, - 0x10, 0x9c, 0x07, 0x9f, 0x5e, 0xdf, 0x3a, 0xa5, 0x9f, 0xee, 0x9c, 0x76, 0x82, 0xf9, 0x70, 0x14, - 0xb9, 0x7d, 0x92, 0x69, 0xdd, 0xfa, 0x6f, 0x93, 0xc5, 0xc7, 0xda, 0x28, 0x51, 0xc0, 0x2e, 0x1f, - 0xae, 0xd6, 0x8d, 0xf0, 0xed, 0x3c, 0xd3, 0x97, 0x08, 0x6d, 0x35, 0xce, 0x2f, 0x9c, 0xd2, 0x9f, - 0x17, 0x8e, 0xf1, 0xc3, 0xc3, 0xd5, 0x7a, 0x4d, 0x5b, 0xac, 0x84, 0xb5, 0x7e, 0x59, 0x04, 0xcb, - 0x01, 0xc5, 0x71, 0x82, 0x76, 0x48, 0x3e, 0xc0, 0x89, 0xb9, 0x05, 0xaa, 0xfd, 0x21, 0x4c, 0x53, - 0x94, 0x27, 0x88, 0x32, 0x29, 0xb2, 0x12, 0x58, 0xbf, 0xfe, 0xbc, 0xb9, 0xaa, 0x75, 0x6e, 0xc7, - 0x31, 0x45, 0x8c, 0x1d, 0x72, 0x8a, 0xf3, 0x24, 0x9c, 0x07, 0x9b, 0x9f, 0x80, 0xa5, 0x82, 0x92, - 0x82, 0x30, 0x44, 0xad, 0x85, 0xa6, 0xf1, 0x8f, 0x85, 0x33, 0xa4, 0xf9, 0x05, 0x00, 0x11, 0xe4, - 0xfd, 0x61, 0x0f, 0xe7, 0x03, 0x62, 0xbd, 0x6a, 0x1a, 0xed, 0x6a, 0xe7, 0x03, 0xf7, 0xe9, 0xc8, - 0xdd, 0x40, 0x60, 0xf6, 0xf2, 0x01, 0x09, 0x2a, 0xc2, 0x17, 0x75, 0xd7, 0x4a, 0x34, 0x8d, 0x9a, - 0xa7, 0x60, 0x85, 0x8d, 0xa2, 0x0c, 0x33, 0x26, 0x0c, 0xc6, 0x39, 0x47, 0x74, 0x0c, 0x53, 0x6b, - 0x51, 0xf6, 0xab, 0xbb, 0x6a, 0x56, 0xee, 0x74, 0x56, 0xee, 0xae, 0x9e, 0x55, 0xe0, 0x8a, 0x6e, - 0x7f, 0xdd, 0x3a, 0x1f, 0xbe, 0x50, 0xbd, 0x41, 0x32, 0xcc, 0x51, 0x56, 0xf0, 0x93, 0xf3, 0x3b, - 0xc7, 0x50, 0x94, 0xe6, 0x23, 0x6e, 0x4f, 0xc3, 0x04, 0xf7, 0x00, 0xe7, 0x30, 0xc5, 0xa7, 0x6a, - 0xbc, 0x05, 0xa2, 0x98, 0xc4, 0xd6, 0xeb, 0x7f, 0xcd, 0xfd, 0x42, 0xf5, 0x8b, 0xdc, 0xf3, 0xb8, - 0xae, 0x84, 0x99, 0xdf, 0x82, 0xf7, 0xe7, 0x94, 0x33, 0x0e, 0x29, 0xef, 0x89, 0x4d, 0xb5, 0xca, - 0x92, 0xbd, 0xf1, 0x8c, 0xfd, 0x68, 0xba, 0xc6, 0x41, 0x4d, 0xd0, 0x9f, 0xcd, 0xba, 0xcf, 0xf9, - 0x77, 0x28, 0xda, 0x08, 0xa0, 0xd9, 0x00, 0x4b, 0x19, 0xe2, 0x30, 0x86, 0x1c, 0x5a, 0x6f, 0x9a, - 0x46, 0x7b, 0x39, 0x9c, 0x9d, 0x5b, 0x9f, 0x83, 0xca, 0x6c, 0x2a, 0xe6, 0x1a, 0xa8, 0xc8, 0x7a, - 0xce, 0x11, 0xb5, 0x0c, 0x31, 0xfd, 0xf0, 0x31, 0x60, 0xae, 0x82, 0xd7, 0xfd, 0x21, 0xc4, 0xb9, - 0xda, 0x8b, 0x50, 0x1d, 0x5a, 0xdb, 0xa0, 0x72, 0x44, 0x8e, 0x51, 0xde, 0x85, 0x98, 0x9a, 0x75, - 0xb0, 0x94, 0xfa, 0xbd, 0x18, 0xe5, 0x24, 0xd3, 0xf5, 0x6f, 0x52, 0x7f, 0x57, 0x1c, 0x65, 0xaa, - 0xa3, 0x53, 0x0b, 0x3a, 0xd5, 0x91, 0xa9, 0xd6, 0x85, 0x01, 0xca, 0x07, 0x23, 0x5e, 0x8c, 0xb8, - 0xe9, 0x80, 0x2a, 0x91, 0x5f, 0x3d, 0x4a, 0x08, 0x97, 0x3d, 0x96, 0x43, 0xa0, 0x42, 0x21, 0x21, - 0xdc, 0xfc, 0x0a, 0xd4, 0x52, 0xbf, 0x17, 0xa5, 0xa4, 0x7f, 0xac, 0x2c, 0x5a, 0xf8, 0xaf, 0x16, - 0x55, 0x53, 0x3f, 0x10, 0xe5, 0xd2, 0x9a, 0x8f, 0xc0, 0xdb, 0xb4, 0xa3, 0xdb, 0xe5, 0xa3, 0x2c, - 0x42, 0x54, 0x6e, 0xef, 0x62, 0x58, 0x4b, 0x3b, 0x12, 0xb5, 0x2f, 0x83, 0xad, 0x73, 0x03, 0xac, - 0xcc, 0x7c, 0xfa, 0x1a, 0xf3, 0xa1, 0xd6, 0xbb, 0x0b, 0x1e, 0xd7, 0x57, 0xaa, 0xfd, 0x5f, 0x7b, - 0xff, 0x19, 0x28, 0xab, 0x2b, 0xea, 0xdb, 0x58, 0xcf, 0x5b, 0x28, 0xbe, 0xf9, 0x7a, 0x5d, 0x12, - 0xec, 0x5f, 0xff, 0x61, 0x97, 0x2e, 0x27, 0xb6, 0x71, 0x3d, 0xb1, 0x8d, 0x9b, 0x89, 0x6d, 0xfc, - 0x3e, 0xb1, 0x8d, 0xb3, 0x7b, 0xbb, 0x74, 0x73, 0x6f, 0x97, 0x7e, 0xbb, 0xb7, 0x4b, 0xdf, 0x6c, - 0xcc, 0x3d, 0x3e, 0xa2, 0x2d, 0x86, 0x9b, 0x29, 0x8c, 0x98, 0x77, 0xd0, 0x95, 0x0f, 0xf6, 0x77, - 0xd3, 0x27, 0x5b, 0x3e, 0x43, 0x51, 0x59, 0x5a, 0xf8, 0xf1, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, - 0xc4, 0x84, 0x37, 0x28, 0xd0, 0x05, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0x4f, 0x6f, 0xe3, 0x44, + 0x14, 0xcf, 0x74, 0xbb, 0xd9, 0x66, 0xd2, 0x68, 0x17, 0x6f, 0x91, 0x9c, 0xb0, 0xd8, 0x51, 0x0e, + 0x28, 0x5a, 0x6d, 0x6d, 0x39, 0xc0, 0x65, 0x39, 0xa0, 0xf5, 0x2e, 0x48, 0x7b, 0xa0, 0x8d, 0xdc, + 0x4a, 0x48, 0x48, 0x28, 0x1a, 0xc7, 0x13, 0x67, 0x54, 0xdb, 0x63, 0xcd, 0x4c, 0x22, 0x5a, 0xbe, + 0x01, 0xa7, 0x1e, 0xcb, 0xad, 0xdc, 0x2a, 0x4e, 0x3d, 0x70, 0xe2, 0x13, 0xf4, 0x58, 0x71, 0xe2, + 0xd4, 0x42, 0x7a, 0x28, 0xe2, 0x53, 0xa0, 0xf9, 0x93, 0x34, 0xb4, 0x15, 0x02, 0x2e, 0x89, 0xdf, + 0x7b, 0xbf, 0xf7, 0x7e, 0x6f, 0x7e, 0xef, 0xe9, 0xc1, 0x67, 0xb4, 0x24, 0x05, 0x11, 0x3e, 0x2d, + 0xc7, 0x94, 0x0b, 0x7f, 0x1a, 0xf8, 0x62, 0xbf, 0xc4, 0xdc, 0x2b, 0x19, 0x15, 0xd4, 0x7a, 0xa2, + 0xa3, 0x9e, 0x8e, 0x7a, 0xd3, 0xa0, 0xf5, 0x0e, 0xca, 0x49, 0x41, 0x7d, 0xf5, 0xab, 0x41, 0x2d, + 0x67, 0x48, 0x79, 0x4e, 0xb9, 0x1f, 0x23, 0x8e, 0xfd, 0x69, 0x10, 0x63, 0x81, 0x02, 0x7f, 0x48, + 0x49, 0x61, 0xe2, 0x4d, 0x1d, 0x1f, 0x28, 0xcb, 0xd7, 0x86, 0x09, 0x6d, 0xa4, 0x34, 0xa5, 0xda, + 0x2f, 0xbf, 0x8c, 0xd7, 0x4d, 0x29, 0x4d, 0x33, 0xec, 0x2b, 0x2b, 0x9e, 0x8c, 0x7c, 0x41, 0x72, + 0xcc, 0x05, 0xca, 0xcb, 0x39, 0xe3, 0x6d, 0x40, 0x32, 0x61, 0x48, 0x10, 0x6a, 0x18, 0x3b, 0x3f, + 0x00, 0x58, 0xed, 0x23, 0x86, 0x72, 0x6e, 0x7d, 0x0b, 0x9f, 0x30, 0x9c, 0x12, 0x2e, 0x34, 0x60, + 0x30, 0xc2, 0xd8, 0x06, 0xed, 0x07, 0xdd, 0x7a, 0xaf, 0xe9, 0x99, 0x56, 0x64, 0xdf, 0x9e, 0xe9, + 0xdb, 0x7b, 0x4d, 0x49, 0x11, 0x7e, 0x7c, 0x76, 0xe1, 0x56, 0x7e, 0xbc, 0x74, 0xbb, 0x29, 0x11, + 0xe3, 0x49, 0xec, 0x0d, 0x69, 0x6e, 0xfa, 0x36, 0x7f, 0x9b, 0x3c, 0xd9, 0x33, 0x42, 0xc9, 0x04, + 0x7e, 0x72, 0x7d, 0xfa, 0x1c, 0x44, 0x8f, 0x97, 0x99, 0x3e, 0xc7, 0xf8, 0x65, 0xeb, 0xe8, 0xd8, + 0xad, 0xfc, 0x71, 0xec, 0x82, 0xef, 0xae, 0x4f, 0x9f, 0x37, 0x8c, 0xc4, 0xba, 0xb1, 0xce, 0xcf, + 0xab, 0x70, 0x3d, 0x64, 0x24, 0x49, 0xf1, 0x6b, 0x5a, 0x8c, 0x48, 0x6a, 0xbd, 0x84, 0xf5, 0xe1, + 0x18, 0x65, 0x19, 0x2e, 0x52, 0xcc, 0xb8, 0x6a, 0xb2, 0x16, 0xda, 0xbf, 0xfc, 0xb4, 0xb9, 0x61, + 0xfa, 0x7c, 0x95, 0x24, 0x0c, 0x73, 0xbe, 0x23, 0x18, 0x29, 0xd2, 0x68, 0x19, 0x6c, 0x7d, 0x04, + 0xd7, 0x4a, 0x46, 0x4b, 0xca, 0x31, 0xb3, 0x57, 0xda, 0xe0, 0x1f, 0x13, 0x17, 0x48, 0xeb, 0x33, + 0x08, 0x63, 0x24, 0x86, 0xe3, 0x01, 0x29, 0x46, 0xd4, 0x7e, 0xd0, 0x06, 0xdd, 0x7a, 0xef, 0x3d, + 0xef, 0xf6, 0xc8, 0xbd, 0x50, 0x62, 0xde, 0x16, 0x23, 0x1a, 0xd6, 0xa4, 0x2e, 0xfa, 0xad, 0xb5, + 0x78, 0xee, 0xb5, 0x0e, 0xe0, 0x53, 0x3e, 0x89, 0x73, 0xc2, 0xb9, 0x14, 0x98, 0x14, 0x02, 0xb3, + 0x29, 0xca, 0xec, 0x55, 0x55, 0xaf, 0xe9, 0xe9, 0x59, 0x79, 0xf3, 0x59, 0x79, 0x6f, 0xcc, 0xac, + 0x42, 0x4f, 0x56, 0xfb, 0xf3, 0xc2, 0x7d, 0xff, 0x9e, 0xec, 0x17, 0x34, 0x27, 0x02, 0xe7, 0xa5, + 0xd8, 0x3f, 0xba, 0x74, 0x81, 0xa6, 0xb4, 0x6e, 0x70, 0x6f, 0x0d, 0x4c, 0x72, 0x8f, 0x48, 0x81, + 0x32, 0x72, 0xa0, 0xc7, 0x5b, 0x62, 0x46, 0x68, 0x62, 0x3f, 0xfc, 0xd7, 0xdc, 0xf7, 0x64, 0xdf, + 0xcb, 0xbd, 0x8c, 0xeb, 0x2b, 0x98, 0xf5, 0x35, 0x7c, 0x77, 0xa9, 0x73, 0x2e, 0x10, 0x13, 0x03, + 0xb9, 0xa9, 0x76, 0x55, 0xb1, 0xb7, 0xee, 0xb0, 0xef, 0xce, 0xd7, 0x38, 0x6c, 0x48, 0xfa, 0xc3, + 0x45, 0xf5, 0x25, 0xfd, 0x76, 0x64, 0x19, 0x09, 0xb4, 0x5a, 0x70, 0x2d, 0xc7, 0x02, 0x25, 0x48, + 0x20, 0xfb, 0x51, 0x1b, 0x74, 0xd7, 0xa3, 0x85, 0xdd, 0xf9, 0x14, 0xd6, 0x16, 0x53, 0xb1, 0x9e, + 0xc1, 0x9a, 0xca, 0x17, 0x02, 0x33, 0x1b, 0xc8, 0xe9, 0x47, 0x37, 0x0e, 0x6b, 0x03, 0x3e, 0x1c, + 0x8e, 0x11, 0x29, 0xf4, 0x5e, 0x44, 0xda, 0xe8, 0xbc, 0x82, 0xb5, 0x5d, 0xba, 0x87, 0x8b, 0x3e, + 0x22, 0xcc, 0x6a, 0xc2, 0xb5, 0x2c, 0x18, 0x24, 0xb8, 0xa0, 0xb9, 0xc9, 0x7f, 0x94, 0x05, 0x6f, + 0xa4, 0xa9, 0x42, 0x3d, 0x13, 0x5a, 0x31, 0xa1, 0x9e, 0x0a, 0x75, 0x8e, 0x01, 0xac, 0x6e, 0x4f, + 0x44, 0x39, 0x11, 0x96, 0x0b, 0xeb, 0x54, 0x7d, 0x0d, 0x18, 0xa5, 0x42, 0xd5, 0x58, 0x8f, 0xa0, + 0x76, 0x45, 0x94, 0x0a, 0xeb, 0x0b, 0xd8, 0xc8, 0x82, 0x41, 0x9c, 0xd1, 0xe1, 0x9e, 0x96, 0x68, + 0xe5, 0xbf, 0x4a, 0x54, 0xcf, 0x82, 0x50, 0xa6, 0x2b, 0x69, 0x3e, 0x80, 0x8f, 0xb3, 0x9e, 0x29, + 0x57, 0x4c, 0xf2, 0x18, 0x33, 0xb5, 0xbd, 0xab, 0x51, 0x23, 0xeb, 0x29, 0xd4, 0x96, 0x72, 0x76, + 0xbe, 0x07, 0xf0, 0xe9, 0x42, 0xa7, 0x2f, 0x89, 0x18, 0x9b, 0x7e, 0xff, 0xbe, 0xf8, 0xe0, 0xff, + 0x2e, 0xfe, 0x27, 0xb0, 0xaa, 0xdf, 0x68, 0x9e, 0x63, 0xdf, 0x2d, 0xa1, 0x09, 0x97, 0xf3, 0x4d, + 0x4a, 0xb8, 0x75, 0xf6, 0xbb, 0x53, 0x39, 0x99, 0x39, 0xe0, 0x6c, 0xe6, 0x80, 0xf3, 0x99, 0x03, + 0x7e, 0x9b, 0x39, 0xe0, 0xf0, 0xca, 0xa9, 0x9c, 0x5f, 0x39, 0x95, 0x5f, 0xaf, 0x9c, 0xca, 0x57, + 0x2f, 0x96, 0xae, 0x8f, 0x2c, 0x4b, 0xd0, 0x66, 0x86, 0x62, 0xee, 0x6f, 0xf7, 0xd5, 0xc5, 0xfe, + 0x66, 0x7e, 0xb3, 0xd5, 0x1d, 0x8a, 0xab, 0x4a, 0xc3, 0x0f, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, + 0x97, 0x27, 0x99, 0xda, 0xd1, 0x05, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool {