@agoric/cosmos 0.35.0-u21.0 → 0.35.0-u22.0

package/x/swingset/keeper/msg_server.go

@@ -3,6 +3,9 @@ package keeper
 import (
 	"context"
 
+	sdkioerrors "cosmossdk.io/errors"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -43,6 +46,18 @@ func (keeper msgServer) routeAction(ctx sdk.Context, msg vm.ControllerAdmissionM
 func (keeper msgServer) DeliverInbound(goCtx context.Context, msg *types.MsgDeliverInbound) (*types.MsgDeliverInboundResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
 
+	if msg.Submitter.Empty() {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidAddress, "Submitter address cannot be empty")
+	}
+	if len(msg.Messages) != len(msg.Nums) {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages and Nums must be the same length")
+	}
+	for _, m := range msg.Messages {
+		if len(m) == 0 {
+			return nil, sdkioerrors.Wrap(sdkerrors.ErrUnknownRequest, "Messages cannot be empty")
+		}
+	}
+
 	// msg.Nums and msg.Messages must be zipped into an array of [num, message] pairs.
 	messages := make([][]interface{}, len(msg.Messages))
 	for i, message := range msg.Messages {
@@ -190,18 +205,24 @@ type installBundleAction struct {
 
 func (keeper msgServer) InstallBundle(goCtx context.Context, msg *types.MsgInstallBundle) (*types.MsgInstallBundleResponse, error) {
 	ctx := sdk.UnwrapSDKContext(goCtx)
+	if err := msg.ValidateBasic(); err != nil {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error())
+	}
 
-	err := msg.Uncompress()
-	if err != nil {
+	if err := msg.Uncompress(); err != nil {
 		return nil, err
 	}
+
+	if err := msg.ValidateBasic(); err != nil {
+		return nil, sdkioerrors.Wrap(sdkerrors.ErrInvalidRequest, err.Error())
+	}
+
 	action := installBundleAction{
 		MsgInstallBundle: msg,
 	}
 
-	err = keeper.routeAction(ctx, msg, action)
-	// fmt.Fprintln(os.Stderr, "Returned from SwingSet", out, err)
-	if err != nil {
+	if err := keeper.routeAction(ctx, msg, action); err != nil {
+		// fmt.Fprintln(os.Stderr, "Returned from SwingSet", out, err)
 		return nil, err
 	}
 

package/x/swingset/keeper/swing_store_exports_handler.go

@@ -10,10 +10,10 @@ import (
 	"regexp"
 
 	sdkioerrors "cosmossdk.io/errors"
+	"cosmossdk.io/log"
 	agoric "github.com/Agoric/agoric-sdk/golang/cosmos/types"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/x/swingset/types"
-	"github.com/cometbft/cometbft/libs/log"
 )
 
 // This module abstracts the generation and handling of swing-store exports,

package/x/swingset/keeper/swing_store_exports_handler_test.go

@@ -5,8 +5,8 @@ import (
 	"io"
 	"testing"
 
+	"cosmossdk.io/log"
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
-	"github.com/cometbft/cometbft/libs/log"
 )
 
 func newTestSwingStoreExportsHandler() *SwingStoreExportsHandler {

package/x/swingset/module.go

@@ -3,8 +3,8 @@ package swingset
 import (
 	"context"
 	"encoding/json"
-	"fmt"
 
+	"cosmossdk.io/core/appmodule"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/spf13/cobra"
 
@@ -16,20 +16,28 @@ import (
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 
-	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // type check to ensure the interface is properly implemented
 var (
-	_ module.AppModule      = AppModule{}
-	_ module.AppModuleBasic = AppModuleBasic{}
+	_ module.AppModule          = AppModule{}
+	_ module.AppModuleBasic     = AppModuleBasic{}
+	_ appmodule.HasBeginBlocker = AppModule{}
+	_ appmodule.HasEndBlocker   = AppModule{}
+	_ module.HasGenesis         = AppModule{}
 )
 
 // app module Basics object
 type AppModuleBasic struct {
 }
 
+// IsAppModule implements the appmodule.AppModule interface.
+func (am AppModule) IsAppModule() {}
+
+// IsOnePerModuleType is a marker function just indicates that this is a one-per-module type.
+func (am AppModule) IsOnePerModuleType() {}
+
 func (AppModuleBasic) Name() string {
 	return ModuleName
 }
@@ -128,26 +136,17 @@ func (am AppModule) RegisterServices(cfg module.Configurator) {
 
 func (AppModule) ConsensusVersion() uint64 { return 2 }
 
-func (am AppModule) BeginBlock(ctx sdk.Context, req abci.RequestBeginBlock) {
+func (am AppModule) BeginBlock(goCtx context.Context) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
 	am.ensureControllerInited(ctx)
 
-	err := BeginBlock(ctx, req, am.keeper)
-	if err != nil {
-		fmt.Println("BeginBlock error:", err)
-	}
+	return BeginBlock(ctx, am.keeper)
 }
 
-func (am AppModule) EndBlock(ctx sdk.Context, req abci.RequestEndBlock) []abci.ValidatorUpdate {
-	valUpdate, err := EndBlock(ctx, req, am.keeper)
-	if err != nil {
-		fmt.Println("EndBlock error:", err)
-	}
-	if valUpdate != nil {
-		return valUpdate
-	}
-
-	// Prevent Cosmos SDK internal errors.
-	return []abci.ValidatorUpdate{}
+func (am AppModule) EndBlock(goCtx context.Context) error {
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	_, err := EndBlock(ctx, am.keeper)
+	return err
 }
 
 func (am *AppModule) checkSwingStoreExportSetup() {
@@ -156,7 +155,7 @@ func (am *AppModule) checkSwingStoreExportSetup() {
 	}
 }
 
-func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) []abci.ValidatorUpdate {
+func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.RawMessage) {
 	var genesisState types.GenesisState
 	cdc.MustUnmarshalJSON(data, &genesisState)
 	am.checkSwingStoreExportSetup()
@@ -164,7 +163,6 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, data json.
 	if bootstrapNeeded {
 		am.setBootstrapNeeded()
 	}
-	return []abci.ValidatorUpdate{}
 }
 
 func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage {

package/x/swingset/types/codec.go

@@ -2,6 +2,7 @@ package types
 
 import (
 	"github.com/cosmos/cosmos-sdk/codec"
+	"github.com/cosmos/cosmos-sdk/codec/legacy"
 	cdctypes "github.com/cosmos/cosmos-sdk/codec/types"
 	cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -29,10 +30,12 @@ func init() {
 
 // RegisterCodec registers concrete types on the Amino codec
 func RegisterCodec(cdc *codec.LegacyAmino) {
-	cdc.RegisterConcrete(&MsgDeliverInbound{}, ModuleName+"/DeliverInbound", nil)
-	cdc.RegisterConcrete(&MsgProvision{}, ModuleName+"/Provision", nil)
-	cdc.RegisterConcrete(&MsgWalletAction{}, ModuleName+"/WalletAction", nil)
-	cdc.RegisterConcrete(&MsgWalletSpendAction{}, ModuleName+"/WalletSpendAction", nil)
+	legacy.RegisterAminoMsg(cdc, &MsgDeliverInbound{}, ModuleName+"/DeliverInbound")
+	legacy.RegisterAminoMsg(cdc, &MsgProvision{}, ModuleName+"/Provision")
+	legacy.RegisterAminoMsg(cdc, &MsgWalletAction{}, ModuleName+"/WalletAction")
+	legacy.RegisterAminoMsg(cdc, &MsgWalletSpendAction{}, ModuleName+"/WalletSpendAction")
+	legacy.RegisterAminoMsg(cdc, &MsgInstallBundle{}, ModuleName+"/InstallBundle")
+	cdc.RegisterConcrete(&CoreEvalProposal{}, ModuleName+"/CoreEvalProposal", nil)
 }
 
 // RegisterInterfaces registers the x/swingset interfaces types with the interface registry
@@ -42,8 +45,10 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		&MsgProvision{},
 		&MsgWalletAction{},
 		&MsgWalletSpendAction{},
+		&MsgInstallBundle{},
 	)
-	registry.RegisterImplementations(
+	registry.RegisterInterface(
+		"cosmos.gov.v1beta1.Content",
 		(*govv1beta1.Content)(nil),
 		&CoreEvalProposal{},
 	)

package/x/swingset/types/default-params.go

@@ -1,6 +1,7 @@
 package types
 
 import (
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -43,15 +44,15 @@ const (
 )
 
 var (
-	DefaultBeansPerXsnapComputron = sdk.NewUint(100)
+	DefaultBeansPerXsnapComputron = sdkmath.NewUint(100)
 
 	// DefaultBeansPerBlockComputeLimit is how many computron beans we allow
 	// before starting a new block.  Some analysis (#3459) suggests this leads to
 	// about 2/3rds utilization, based on 5 sec voting time and up to 10 sec of
 	// computation.
-	DefaultBeansPerBlockComputeLimit = sdk.NewUint(8000000).Mul(DefaultBeansPerXsnapComputron)
+	DefaultBeansPerBlockComputeLimit = sdkmath.NewUint(8000000).Mul(DefaultBeansPerXsnapComputron)
 	// observed: 0.385 sec
-	DefaultBeansPerVatCreation = sdk.NewUint(300000).Mul(DefaultBeansPerXsnapComputron)
+	DefaultBeansPerVatCreation = sdkmath.NewUint(300000).Mul(DefaultBeansPerXsnapComputron)
 
 	// Fees are represented as integer "beans", where each bean is a uniform
 	// fraction of this `fee_unit_price` as controlled by the below
@@ -63,14 +64,14 @@ var (
 	// Larger numbers make for smaller beans, and we expect values to be rather
 	// large for representing fees precisely in beans that each approximate
 	// a "picoUSD"--one trillionth of a USD.
-	DefaultBeansPerFeeUnit = sdk.NewUint(1_000_000_000_000) // 1e12 (assumes $1 per BLD)
+	DefaultBeansPerFeeUnit = sdkmath.NewUint(1_000_000_000_000) // 1e12 (assumes $1 per BLD)
 
-	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(100))    //  10e09, ~$0.01
-	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(1_000))  //   1e09, ~$0.001
-	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(50_000)) //  20e06, ~$0.00002
-	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(5))      // 200e09, ~$0.2
-	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdk.NewUint(500))    //   2e09, ~$0.002
-	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                          //   1e12, ~$1
+	DefaultBeansPerInboundTx            = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(100))    //  10e09, ~$0.01
+	DefaultBeansPerMessage              = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(1_000))  //   1e09, ~$0.001
+	DefaultBeansPerMessageByte          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(50_000)) //  20e06, ~$0.00002
+	DefaultBeansPerMinFeeDebit          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(5))      // 200e09, ~$0.2
+	DefaultBeansPerStorageByte          = DefaultBeansPerFeeUnit.Quo(sdkmath.NewUint(500))    //   2e09, ~$0.002
+	DefaultBeansPerSmartWalletProvision = DefaultBeansPerFeeUnit                              //   1e12, ~$1
 
 	DefaultBootstrapVatConfig = "@agoric/vm-config/decentral-core-config.json"
 
@@ -83,11 +84,11 @@ var (
 		NewQueueSize(QueueInbound, DefaultInboundQueueMax),
 	}
 
-	DefaultVatCleanupDefault = sdk.NewUint(5)
+	DefaultVatCleanupDefault = sdkmath.NewUint(5)
 	// DefaultVatCleanupExports     = DefaultVatCleanupDefault
 	// DefaultVatCleanupImports     = DefaultVatCleanupDefault
 	// DefaultVatCleanupPromises    = DefaultVatCleanupDefault
-	DefaultVatCleanupKv = sdk.NewUint(50)
+	DefaultVatCleanupKv = sdkmath.NewUint(50)
 	// DefaultVatCleanupSnapshots   = DefaultVatCleanupDefault
 	// DefaultVatCleanupTranscripts = DefaultVatCleanupDefault
 	DefaultVatCleanupBudget = []UintMapEntry{

package/x/swingset/types/expected_keepers.go

@@ -1,9 +1,10 @@
 package types
 
 import (
+	context "context"
+
 	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 )
 
 type SmartWalletState uint8
@@ -16,9 +17,9 @@ const (
 )
 
 type AccountKeeper interface {
-	GetAccount(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
-	NewAccountWithAddress(ctx sdk.Context, addr sdk.AccAddress) authtypes.AccountI
-	SetAccount(ctx sdk.Context, acc authtypes.AccountI)
+	GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	NewAccountWithAddress(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
+	SetAccount(ctx context.Context, acc sdk.AccountI)
 }
 
 type SwingSetKeeper interface {

package/x/swingset/types/msgs.go

@@ -9,11 +9,16 @@ import (
 
 	sdkioerrors "cosmossdk.io/errors"
 	sdkmath "cosmossdk.io/math"
+	"cosmossdk.io/x/tx/signing"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 
 	"github.com/Agoric/agoric-sdk/golang/cosmos/vm"
+
+	"google.golang.org/protobuf/proto"
+	"google.golang.org/protobuf/protoadapt"
+	"google.golang.org/protobuf/reflect/protoreflect"
 )
 
 const RouterKey = ModuleName // this was defined in your key.go file
@@ -32,6 +37,42 @@ var (
 	_ vm.ControllerAdmissionMsg = &MsgWalletSpendAction{}
 )
 
+// Replacing msg.GetSigners() but before we can adopt AddressString.
+// https://github.com/cosmos/cosmos-sdk/issues/20077#issuecomment-2062601533
+func createSignerFieldFunc(fieldName protoreflect.Name) signing.GetSignersFunc {
+	return func(msgIn proto.Message) ([][]byte, error) {
+		msg := msgIn.ProtoReflect()
+		if !msg.Has(msg.Descriptor().Fields().ByName(fieldName)) {
+			return nil, sdkioerrors.Wrapf(sdkerrors.ErrInvalidRequest, "message %T does not have field %s", msgIn, fieldName)
+		}
+		addr := msg.Get(msg.Descriptor().Fields().ByName(fieldName)).Interface().([]byte)
+		return [][]byte{addr}, nil
+	}
+}
+
+func DefineCustomGetSigners(options *signing.Options) {
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgDeliverInbound{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgProvision{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgInstallBundle{})),
+		createSignerFieldFunc("submitter"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgWalletAction{})),
+		createSignerFieldFunc("owner"),
+	)
+	options.DefineCustomGetSigners(
+		proto.MessageName(protoadapt.MessageV2Of(&MsgWalletSpendAction{})),
+		createSignerFieldFunc("owner"),
+	)
+}
+
 // Contextual information about the message source of an action on an inbound queue.
 // This context should be unique per inboundQueueRecord.
 type ActionContext struct {
@@ -46,6 +87,7 @@ type ActionContext struct {
 	// actionContext unique. (for example a counter per block and source module).
 	MsgIdx int `json:"msgIdx"`
 }
+
 type InboundQueueRecord struct {
 	Action  vm.Jsonable   `json:"action"`
 	Context ActionContext `json:"context"`
@@ -172,18 +214,6 @@ func (msg MsgDeliverInbound) ValidateBasic() error {
 	return nil
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgDeliverInbound) GetSignBytes() []byte {
-	// FIXME: This compensates for Amino maybe returning nil instead of empty slices.
-	if msg.Messages == nil {
-		msg.Messages = []string{}
-	}
-	if msg.Nums == nil {
-		msg.Nums = []uint64{}
-	}
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // GetSigners defines whose signature is required
 func (msg MsgDeliverInbound) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Submitter}
@@ -222,32 +252,17 @@ func (msg MsgWalletAction) IsHighPriority(ctx sdk.Context, data interface{}) (bo
 	return false, nil
 }
 
+// GetSigners defines whose signature is required
 func (msg MsgWalletAction) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Owner}
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgWalletAction) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // Route should return the name of the module
 func (msg MsgWalletAction) Route() string { return RouterKey }
 
 // Type should return the action
 func (msg MsgWalletAction) Type() string { return "wallet_action" }
 
-// Route should return the name of the module
-func (msg MsgWalletSpendAction) Route() string { return RouterKey }
-
-// Type should return the action
-func (msg MsgWalletSpendAction) Type() string { return "wallet_spend_action" }
-
-// GetSignBytes encodes the message for signing
-func (msg MsgWalletSpendAction) GetSignBytes() []byte {
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
@@ -300,10 +315,17 @@ func (msg MsgWalletSpendAction) IsHighPriority(ctx sdk.Context, data interface{}
 	return keeper.IsHighPriorityAddress(ctx, msg.Owner)
 }
 
+// GetSigners defines whose signature is required
 func (msg MsgWalletSpendAction) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Owner}
 }
 
+// Route should return the name of the module
+func (msg MsgWalletSpendAction) Route() string { return RouterKey }
+
+// Type should return the action
+func (msg MsgWalletSpendAction) Type() string { return "wallet_spend_action" }
+
 // ValidateBasic runs stateless checks on the message
 func (msg MsgWalletSpendAction) ValidateBasic() error {
 	if msg.Owner.Empty() {
@@ -368,14 +390,6 @@ func (msg MsgProvision) IsHighPriority(ctx sdk.Context, data interface{}) (bool,
 	return false, nil
 }
 
-// GetSignBytes encodes the message for signing
-func (msg MsgProvision) GetSignBytes() []byte {
-	if msg.PowerFlags == nil {
-		msg.PowerFlags = []string{}
-	}
-	return sdk.MustSortJSON(ModuleAminoCdc.MustMarshalJSON(&msg))
-}
-
 // GetSigners defines whose signature is required
 func (msg MsgProvision) GetSigners() []sdk.AccAddress {
 	return []sdk.AccAddress{msg.Submitter}

package/x/swingset/types/msgs.pb.go

@@ -7,6 +7,7 @@ import (
 	context "context"
 	fmt "fmt"
 	github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types"
+	_ "github.com/cosmos/cosmos-sdk/types/tx/amino"
 	_ "github.com/cosmos/gogoproto/gogoproto"
 	grpc1 "github.com/cosmos/gogoproto/grpc"
 	proto "github.com/cosmos/gogoproto/proto"
@@ -553,57 +554,65 @@ func init() {
 func init() { proto.RegisterFile("agoric/swingset/msgs.proto", fileDescriptor_788baa062b181a57) }
 
 var fileDescriptor_788baa062b181a57 = []byte{
-	// 788 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0x8e, 0xe3, 0x50, 0x36, 0xaf, 0xd9, 0x6d, 0x63, 0x95, 0xad, 0xd7, 0x0b, 0x99, 0xac, 0xa5,
-	0x15, 0x01, 0xd4, 0x44, 0xb0, 0xb7, 0xed, 0x29, 0x16, 0x42, 0x5a, 0xa4, 0xa0, 0xc5, 0x2b, 0x84,
-	0x54, 0x81, 0x5a, 0xc7, 0x19, 0x5c, 0x2b, 0xb6, 0xc7, 0xf2, 0x38, 0x2d, 0xed, 0x8d, 0xff, 0x00,
-	0xfe, 0x01, 0x04, 0xff, 0x0d, 0xc7, 0x1e, 0x11, 0x87, 0x51, 0x95, 0x5e, 0x90, 0x8f, 0x3e, 0x72,
-	0x42, 0x9e, 0xf1, 0x8f, 0xfc, 0x82, 0xa2, 0x1e, 0xca, 0x29, 0x79, 0xdf, 0xf7, 0xbd, 0xf7, 0xbe,
-	0x99, 0x79, 0x63, 0x1b, 0x34, 0xcb, 0x21, 0x91, 0x6b, 0x0f, 0xe8, 0xb9, 0x1b, 0x38, 0x14, 0xc7,
-	0x03, 0x9f, 0x3a, 0xb4, 0x1f, 0x46, 0x24, 0x26, 0xca, 0x8e, 0xe0, 0xfa, 0x05, 0xa7, 0xed, 0x39,
-	0xc4, 0x21, 0x9c, 0x1b, 0x64, 0xff, 0x84, 0x4c, 0xff, 0xb9, 0x0e, 0xed, 0x11, 0x75, 0x3e, 0xc5,
-	0x9e, 0x7b, 0x86, 0xa3, 0x57, 0xc1, 0x98, 0xcc, 0x82, 0x89, 0x72, 0x08, 0x0f, 0x7c, 0x4c, 0xa9,
-	0xe5, 0x60, 0xaa, 0x4a, 0x5d, 0xb9, 0xd7, 0x34, 0x50, 0xc2, 0x50, 0x89, 0xa5, 0x0c, 0xed, 0x5c,
-	0x58, 0xbe, 0xf7, 0x52, 0x2f, 0x10, 0xdd, 0x2c, 0x49, 0xe5, 0x23, 0x68, 0x04, 0x33, 0x9f, 0xaa,
-	0xf5, 0xae, 0xdc, 0x6b, 0x18, 0xfb, 0x09, 0x43, 0x3c, 0x4e, 0x19, 0xda, 0x16, 0x49, 0x59, 0xa4,
-	0x9b, 0x1c, 0x54, 0xde, 0x07, 0xd9, 0xb2, 0xa7, 0xaa, 0xdc, 0x95, 0x7a, 0x0d, 0xe3, 0x9d, 0x84,
-	0xa1, 0x2c, 0x4c, 0x19, 0x02, 0x21, 0xb5, 0xec, 0xa9, 0x6e, 0x66, 0x90, 0x12, 0x42, 0x93, 0xce,
-	0xc6, 0xbe, 0x1b, 0xc7, 0x38, 0x52, 0x1b, 0x5d, 0xa9, 0xd7, 0x32, 0xcc, 0x84, 0xa1, 0x0a, 0x4c,
-	0x19, 0xda, 0x15, 0x49, 0x25, 0xa4, 0xff, 0xc5, 0xd0, 0x81, 0xe3, 0xc6, 0xa7, 0xb3, 0x71, 0xdf,
-	0x26, 0xfe, 0xc0, 0x26, 0xd4, 0x27, 0x34, 0xff, 0x39, 0xa0, 0x93, 0xe9, 0x20, 0xbe, 0x08, 0x31,
-	0xed, 0x0f, 0x6d, 0x7b, 0x38, 0x99, 0x44, 0x98, 0x52, 0xb3, 0xaa, 0xf7, 0xb2, 0xf1, 0xe7, 0x2f,
-	0xa8, 0xa6, 0x3f, 0x85, 0x27, 0x6b, 0xfb, 0x63, 0x62, 0x1a, 0x92, 0x80, 0x62, 0xfd, 0x27, 0x09,
-	0x76, 0x46, 0xd4, 0xf9, 0xda, 0xf2, 0x3c, 0x1c, 0x0f, 0xed, 0xd8, 0x25, 0x81, 0x72, 0x02, 0x6f,
-	0x91, 0xf3, 0x00, 0x47, 0xaa, 0xc4, 0x4d, 0x7e, 0x9e, 0x30, 0x24, 0x80, 0x94, 0xa1, 0x96, 0x30,
-	0xc8, 0xc3, 0x3b, 0x98, 0x13, 0x75, 0x94, 0xc7, 0xb0, 0x65, 0xf1, 0x5e, 0x6a, 0xbd, 0x2b, 0xf5,
-	0x9a, 0x66, 0x1e, 0xe5, 0x86, 0x9f, 0xc0, 0xfe, 0x8a, 0xa5, 0xd2, 0xee, 0xaf, 0x12, 0xec, 0x95,
-	0xdc, 0x9b, 0x10, 0x07, 0x93, 0x7b, 0xf3, 0xfc, 0x0c, 0x5a, 0x34, 0x6b, 0x78, 0xbc, 0xe4, 0x7c,
-	0x9b, 0x56, 0x26, 0x72, 0xfb, 0x1d, 0x78, 0x77, 0x93, 0xc5, 0x72, 0x0d, 0x3f, 0xc8, 0xd0, 0x1a,
-	0x51, 0xe7, 0x75, 0x44, 0xce, 0x5c, 0x9a, 0x79, 0x3f, 0x84, 0x07, 0x81, 0x6b, 0x4f, 0x03, 0xcb,
-	0xc7, 0xdc, 0x7e, 0x3e, 0xab, 0x05, 0x56, 0xcd, 0x6a, 0x81, 0xe8, 0x66, 0x49, 0x2a, 0xa7, 0xf0,
-	0xb6, 0x25, 0x8c, 0x72, 0x47, 0x2d, 0xe3, 0x8b, 0x84, 0xa1, 0x02, 0x4a, 0x19, 0x7a, 0x94, 0x8f,
-	0xa1, 0x00, 0xee, 0xb0, 0xfc, 0xa2, 0x96, 0x62, 0xc2, 0x76, 0x48, 0xce, 0x71, 0x74, 0xfc, 0x9d,
-	0x67, 0x39, 0x54, 0x95, 0xf9, 0xad, 0xfa, 0x78, 0xce, 0x10, 0xbc, 0xce, 0xe0, 0xcf, 0x32, 0x34,
-	0x61, 0x08, 0xc2, 0x32, 0x4a, 0x19, 0x6a, 0x8b, 0xf6, 0x15, 0xa6, 0x9b, 0x0b, 0x82, 0xff, 0xed,
-	0x4e, 0x3c, 0xe6, 0x63, 0x54, 0x1e, 0x41, 0x79, 0x36, 0x7f, 0xd4, 0x61, 0x77, 0x44, 0x9d, 0x57,
-	0x01, 0x8d, 0x2d, 0xcf, 0x33, 0x66, 0xc1, 0xc4, 0xc3, 0xca, 0x0b, 0xd8, 0x1a, 0xf3, 0x7f, 0xf9,
-	0xe9, 0x3c, 0x4d, 0x18, 0xca, 0x91, 0x94, 0xa1, 0x87, 0xc2, 0x9e, 0x88, 0x75, 0x33, 0x27, 0x96,
-	0x57, 0x56, 0xbf, 0x87, 0x95, 0x29, 0xdf, 0x40, 0xdb, 0x26, 0x7e, 0x98, 0xc1, 0x78, 0x72, 0x9c,
-	0x3b, 0x96, 0x79, 0xe7, 0x41, 0xc2, 0xd0, 0x6e, 0x45, 0x1a, 0x85, 0xf7, 0x7d, 0x61, 0x60, 0x95,
-	0xd1, 0xcd, 0x35, 0xb1, 0x32, 0x84, 0xf6, 0x2c, 0x58, 0xa8, 0x4f, 0xdd, 0x4b, 0xcc, 0x4f, 0x4c,
-	0x36, 0xf6, 0xb2, 0xea, 0x8b, 0xe4, 0x1b, 0xf7, 0x12, 0x9b, 0x6b, 0x88, 0xae, 0x81, 0xba, 0xba,
-	0xb7, 0xc5, 0xc6, 0x7f, 0x72, 0x2d, 0x83, 0x3c, 0xa2, 0x8e, 0xf2, 0x2d, 0x3c, 0x5c, 0xde, 0xfc,
-	0x67, 0xfd, 0x95, 0xd7, 0x40, 0x7f, 0xb5, 0x86, 0xf6, 0xc1, 0xad, 0x92, 0xa2, 0x8d, 0x72, 0x02,
-	0x8f, 0x56, 0x5e, 0x14, 0xfa, 0xa6, 0xe4, 0x65, 0x8d, 0xf6, 0xe1, 0xed, 0x9a, 0xb2, 0xc3, 0x11,
-	0xb4, 0x96, 0x1e, 0xa6, 0xdd, 0x4d, 0xb9, 0x8b, 0x0a, 0xad, 0x77, 0x9b, 0xa2, 0xac, 0xed, 0x42,
-	0x7b, 0xfd, 0xc9, 0xf7, 0xfc, 0x9f, 0xd3, 0x17, 0x64, 0xda, 0xc1, 0x7f, 0x92, 0x95, 0xad, 0xbe,
-	0x84, 0x66, 0xf5, 0x80, 0x7a, 0x6f, 0x53, 0x6e, 0x49, 0x6b, 0xcf, 0xff, 0x95, 0x2e, 0x4a, 0x1a,
-	0x5f, 0xfd, 0x36, 0xef, 0x48, 0x57, 0xf3, 0x8e, 0x74, 0x3d, 0xef, 0x48, 0x3f, 0xde, 0x74, 0x6a,
-	0x57, 0x37, 0x9d, 0xda, 0xef, 0x37, 0x9d, 0xda, 0xd1, 0xe1, 0xc2, 0xcc, 0x0f, 0xc5, 0x07, 0x81,
-	0xa8, 0xc8, 0x67, 0xde, 0x21, 0x9e, 0x15, 0x38, 0xc5, 0x65, 0xf8, 0xbe, 0xfa, 0x56, 0xe0, 0x97,
-	0x61, 0xbc, 0xc5, 0x3f, 0x03, 0x5e, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x51, 0x66, 0x1b, 0xd5,
-	0x4b, 0x08, 0x00, 0x00,
+	// 915 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0xcf, 0x6f, 0xe3, 0x44,
+	0x14, 0xae, 0xeb, 0x52, 0x36, 0xaf, 0xd9, 0xb6, 0x31, 0x4b, 0x9b, 0x75, 0x21, 0x93, 0x35, 0x5a,
+	0x29, 0x44, 0x34, 0x91, 0x80, 0x03, 0xca, 0x72, 0xa9, 0x85, 0x10, 0x3d, 0x44, 0x5a, 0xb2, 0x42,
+	0xa0, 0x45, 0x55, 0x70, 0x9c, 0xc1, 0x58, 0xb5, 0x67, 0xa2, 0x8c, 0xd3, 0xd2, 0x45, 0xe2, 0xc2,
+	0x0d, 0x09, 0x89, 0x33, 0x27, 0xc4, 0x89, 0x63, 0xff, 0x02, 0x4e, 0x1c, 0x38, 0xae, 0xc4, 0x85,
+	0xd3, 0x68, 0xd5, 0x1e, 0x8a, 0xcc, 0x2d, 0x47, 0x4e, 0xc8, 0x33, 0xf6, 0xd8, 0x71, 0xbb, 0x94,
+	0xc3, 0x4a, 0xcb, 0x25, 0xf1, 0xfb, 0xde, 0xcf, 0x6f, 0xde, 0x7b, 0x63, 0x83, 0xe9, 0x78, 0x74,
+	0xea, 0xbb, 0x5d, 0x76, 0xec, 0x13, 0x8f, 0xe1, 0xa8, 0x1b, 0x32, 0x8f, 0x75, 0x26, 0x53, 0x1a,
+	0x51, 0x63, 0x43, 0xea, 0x3a, 0x99, 0xce, 0xac, 0x39, 0xa1, 0x4f, 0x68, 0x57, 0xfc, 0x4a, 0x1b,
+	0xf3, 0x96, 0x47, 0x3d, 0x2a, 0x1e, 0xbb, 0xc9, 0x93, 0x44, 0xad, 0xef, 0x74, 0xa8, 0xf5, 0x99,
+	0xf7, 0x1e, 0x0e, 0xfc, 0x23, 0x3c, 0xdd, 0x27, 0x23, 0x3a, 0x23, 0x63, 0xe3, 0x13, 0xb8, 0x11,
+	0x62, 0xc6, 0x1c, 0x0f, 0xb3, 0xba, 0xd6, 0xd4, 0x5b, 0x15, 0xfb, 0xdd, 0x98, 0x23, 0x85, 0xcd,
+	0x39, 0xda, 0x38, 0x71, 0xc2, 0xa0, 0x67, 0x65, 0x88, 0xf5, 0xc3, 0xc5, 0x69, 0xfb, 0x25, 0x32,
+	0x0b, 0x82, 0x21, 0x0b, 0x7c, 0x17, 0x0f, 0x1d, 0x36, 0xc4, 0xe1, 0x24, 0x3a, 0xf9, 0xf9, 0xe2,
+	0xb4, 0xad, 0x0d, 0x94, 0xa7, 0xf1, 0x01, 0xac, 0x90, 0x59, 0xc8, 0xea, 0xcb, 0x4d, 0xbd, 0xb5,
+	0x62, 0xbf, 0x1d, 0x73, 0x24, 0xe4, 0x39, 0x47, 0x6b, 0x32, 0x62, 0x22, 0x5d, 0x13, 0x4d, 0x78,
+	0x18, 0x6f, 0x80, 0xee, 0xb8, 0x87, 0x75, 0xbd, 0xa9, 0xb5, 0x56, 0x6c, 0x33, 0xe6, 0x28, 0x11,
+	0xe7, 0x1c, 0x81, 0x8c, 0xe3, 0xb8, 0x87, 0x96, 0x34, 0x4f, 0x70, 0xe3, 0x1b, 0x0d, 0x2a, 0x6c,
+	0x36, 0x0a, 0xfd, 0x28, 0xc2, 0xd3, 0xfa, 0x4a, 0x53, 0x6b, 0x55, 0x6d, 0x1c, 0x73, 0x94, 0x83,
+	0x73, 0x8e, 0x36, 0xa5, 0xab, 0x82, 0xac, 0xbf, 0x39, 0xda, 0xf5, 0xfc, 0xe8, 0x8b, 0xd9, 0xa8,
+	0xe3, 0xd2, 0xb0, 0xeb, 0x52, 0x16, 0x52, 0x96, 0xfe, 0xed, 0xb2, 0xf1, 0x61, 0x37, 0x3a, 0x99,
+	0x60, 0xd6, 0xd9, 0x73, 0xdd, 0xbd, 0xf1, 0x78, 0x8a, 0x19, 0x4b, 0x0a, 0x5f, 0x0f, 0xb0, 0xe7,
+	0xb8, 0x27, 0x43, 0x47, 0x42, 0x83, 0x3c, 0x45, 0xaf, 0xf9, 0xe7, 0x8f, 0x68, 0xe9, 0xdb, 0x8b,
+	0xd3, 0xf6, 0xb6, 0xea, 0xe2, 0xe2, 0xc9, 0x5b, 0x3b, 0x70, 0xfb, 0x52, 0x3b, 0x06, 0x98, 0x4d,
+	0x28, 0x61, 0xd8, 0xfa, 0x45, 0x83, 0x8d, 0x3e, 0xf3, 0x3e, 0x76, 0x82, 0x00, 0x47, 0x7b, 0x6e,
+	0xe4, 0x53, 0x62, 0x30, 0x78, 0x81, 0x1e, 0x13, 0x3c, 0xad, 0x6b, 0x82, 0xd3, 0x41, 0xcc, 0x91,
+	0x04, 0xe6, 0x1c, 0x55, 0x25, 0x1f, 0x21, 0x3e, 0x1b, 0x2e, 0x32, 0xb4, 0xb1, 0x05, 0xab, 0x8e,
+	0x48, 0x5f, 0x5f, 0x6e, 0x6a, 0xad, 0xca, 0x20, 0x95, 0x7a, 0x8d, 0x8c, 0xdf, 0xcb, 0x8a, 0x5f,
+	0xb1, 0x58, 0xeb, 0x36, 0x6c, 0x97, 0xea, 0x57, 0xdc, 0x7e, 0xd7, 0xe0, 0x96, 0xd2, 0x3d, 0x98,
+	0x60, 0x32, 0x7e, 0x9e, 0x04, 0xef, 0x40, 0x95, 0x25, 0x35, 0x0c, 0x17, 0x68, 0xae, 0xb1, 0xbc,
+	0xae, 0xde, 0x6b, 0x19, 0x57, 0xb3, 0xc4, 0xb5, 0x50, 0xbc, 0xd5, 0x80, 0x57, 0xae, 0x22, 0xa5,
+	0x58, 0xff, 0xa5, 0x43, 0xb5, 0xcf, 0xbc, 0xfb, 0x53, 0x7a, 0xe4, 0xb3, 0x84, 0xed, 0x3d, 0xb8,
+	0x41, 0x7c, 0xf7, 0x90, 0x38, 0x21, 0x16, 0x84, 0x2b, 0x36, 0x4a, 0x36, 0x2f, 0xc3, 0xf2, 0xcd,
+	0xcb, 0x10, 0x6b, 0xa0, 0x94, 0xc6, 0x57, 0xf0, 0x62, 0xca, 0x43, 0x14, 0x5c, 0xb5, 0x9d, 0x98,
+	0xa3, 0x0c, 0x9a, 0x73, 0xb4, 0x9e, 0xae, 0x86, 0x04, 0x9e, 0xcd, 0x81, 0x65, 0xe1, 0x8d, 0xaf,
+	0x61, 0x6d, 0x42, 0x8f, 0xf1, 0x74, 0xf8, 0x79, 0xe0, 0x78, 0xac, 0xae, 0x8b, 0x6b, 0xe3, 0xe0,
+	0x8c, 0x23, 0xb8, 0x9f, 0xc0, 0xef, 0x27, 0x68, 0xcc, 0x11, 0x4c, 0x94, 0x34, 0xe7, 0xa8, 0x26,
+	0x2b, 0xca, 0xb1, 0xa7, 0xae, 0xfe, 0x4f, 0x17, 0xa7, 0xed, 0x82, 0xaf, 0x5c, 0xed, 0x02, 0xf0,
+	0x3f, 0xd9, 0xf0, 0x9d, 0x6c, 0x2a, 0x0c, 0x35, 0x15, 0xaa, 0xb9, 0xd6, 0x96, 0x18, 0x71, 0x25,
+	0xab, 0x29, 0xf8, 0x55, 0x87, 0xcd, 0x3e, 0xf3, 0xf6, 0x09, 0x8b, 0x9c, 0x20, 0xb0, 0x67, 0x64,
+	0x1c, 0x60, 0xe3, 0x1d, 0x58, 0x1d, 0x89, 0xa7, 0x74, 0x0e, 0x9a, 0x31, 0x47, 0x29, 0x32, 0xe7,
+	0xe8, 0xa6, 0x24, 0x22, 0xe5, 0xf4, 0xa2, 0x4b, 0xb5, 0xa5, 0x93, 0x58, 0x7e, 0x3e, 0x27, 0x61,
+	0x1c, 0x41, 0xcd, 0xa5, 0xe1, 0x24, 0x81, 0xf1, 0x78, 0x98, 0x52, 0xd1, 0x45, 0x31, 0xfb, 0x31,
+	0x47, 0x9b, 0xb9, 0xd2, 0xce, 0x48, 0x6d, 0xcb, 0x9a, 0xca, 0x1a, 0x2b, 0xe9, 0xfd, 0x25, 0x7b,
+	0xc9, 0xf9, 0x12, 0x6c, 0x7c, 0x0a, 0xb5, 0x19, 0x29, 0x64, 0x66, 0xfe, 0x23, 0x2c, 0xc6, 0x41,
+	0xb7, 0x3b, 0x49, 0xde, 0xa2, 0xf2, 0x81, 0xff, 0x08, 0x8b, 0xe0, 0x65, 0x30, 0x0d, 0x5e, 0x86,
+	0x7b, 0x3b, 0x49, 0x6b, 0xb7, 0x54, 0x6b, 0x17, 0x3a, 0x66, 0x99, 0x50, 0x2f, 0x77, 0x31, 0x6b,
+	0xf1, 0x9b, 0x4f, 0x74, 0xd0, 0xfb, 0xcc, 0x33, 0x0e, 0xe0, 0xe6, 0x62, 0x9b, 0xef, 0x74, 0x4a,
+	0xef, 0xee, 0x4e, 0x39, 0x86, 0xf9, 0xfa, 0xb5, 0x26, 0x59, 0x1a, 0xe3, 0x33, 0x58, 0x2f, 0xbd,
+	0xca, 0xad, 0xab, 0x9c, 0x17, 0x6d, 0xcc, 0xf6, 0xf5, 0x36, 0x2a, 0xc3, 0x43, 0xa8, 0x2e, 0xbc,
+	0x7f, 0x9a, 0x57, 0xf9, 0x16, 0x2d, 0xcc, 0xd6, 0x75, 0x16, 0x2a, 0xb6, 0x0f, 0xb5, 0xcb, 0xf7,
+	0xff, 0xdd, 0xa7, 0xbb, 0x17, 0xcc, 0xcc, 0xdd, 0xff, 0x64, 0xa6, 0x52, 0x7d, 0x08, 0x95, 0xfc,
+	0xd2, 0x7d, 0xf5, 0x2a, 0x5f, 0xa5, 0x36, 0xef, 0xfe, 0xab, 0x3a, 0x0b, 0x69, 0x7f, 0xf4, 0xdb,
+	0x59, 0x43, 0x7b, 0x7c, 0xd6, 0xd0, 0x9e, 0x9c, 0x35, 0xb4, 0xef, 0xcf, 0x1b, 0x4b, 0x8f, 0xcf,
+	0x1b, 0x4b, 0x7f, 0x9c, 0x37, 0x96, 0x1e, 0xde, 0x2b, 0xec, 0xd5, 0x9e, 0xfc, 0x8a, 0x93, 0x11,
+	0xc5, 0x5e, 0x79, 0x34, 0x70, 0x88, 0x97, 0x2d, 0xdc, 0x97, 0xf9, 0x07, 0x9e, 0x58, 0xb8, 0xd1,
+	0xaa, 0xf8, 0x50, 0x7b, 0xeb, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x7c, 0xfc, 0xce, 0xd6, 0x00,
+	0x0a, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.