From ce32907b21539e3ec24a91474e68023705b0bcc7 Mon Sep 17 00:00:00 2001 From: "Matt, Park" <45252226+mattverse@users.noreply.github.com> Date: Fri, 6 Jan 2023 17:34:18 +0900 Subject: [PATCH] [CL]: Deprecate duplicated queries from gamm module (#3905) * Remove Estimate queries from gamm module * Deprecate numpools query * Add changelog, fix e2e * Update CHANGELOG.md Co-authored-by: Roman * Bring back deleted stargate queries * Fix CI Co-authored-by: Roman Co-authored-by: Adam Tucker --- CHANGELOG.md | 4 +- proto/osmosis/gamm/v1beta1/query.proto | 16 +- tests/e2e/configurer/chain/commands.go | 1 + wasmbinding/stargate_whitelist.go | 1 + x/concentrated-liquidity/model/pool.go | 13 +- x/gamm/client/cli/query.go | 5 + x/gamm/keeper/grpc_query.go | 7 +- x/gamm/types/query.pb.go | 249 +++++++++++++------------ 8 files changed, 166 insertions(+), 130 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4af9976070a..6687d5a8727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -67,11 +67,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 * [#3817](https://github.com/osmosis-labs/osmosis/pull/3817) Move osmoassert from `app/apptesting/osmoassert` to `osmoutils/osmoassert`. * [#3771](https://github.com/osmosis-labs/osmosis/pull/3771) Move osmomath into its own go.mod * [#3827](https://github.com/osmosis-labs/osmosis/pull/3827) Move osmoutils into its own go.mod +* [#3905](https://github.com/osmosis-labs/osmosis/pull/3905) Deprecate gamm queries `NumPools`, `EstimateSwapExactAmountIn` and `EstimateSwapExactAmountOut`. * [#3907](https://github.com/osmosis-labs/osmosis/pull/3907) Add `NumPools`, `EstimateSwapExactAmountIn` and `EstimateSwapExactAmountOut` query in swaprouter module to stargate whitelist. - - - ### Bug fixes * [#3608](https://github.com/osmosis-labs/osmosis/pull/3608) Make it possible to state export from any directory. diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index fbf976691ae..6eef1b79024 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -17,7 +17,9 @@ service Query { option (google.api.http).get = "/osmosis/gamm/v1beta1/pools"; } + // Deprecated: please use the alternative in x/swaprouter rpc NumPools(QueryNumPoolsRequest) returns (QueryNumPoolsResponse) { + option deprecated = true; option (google.api.http).get = "/osmosis/gamm/v1beta1/num_pools"; } @@ -85,15 +87,18 @@ service Query { "/osmosis/gamm/v1beta1/pools/{pool_id}/prices"; } - // Estimate the swap. + // Deprecated: please use the alternative in x/swaprouter rpc EstimateSwapExactAmountIn(QuerySwapExactAmountInRequest) returns (QuerySwapExactAmountInResponse) { + option deprecated = true; option (google.api.http).get = "/osmosis/gamm/v1beta1/{pool_id}/estimate/swap_exact_amount_in"; } + // Deprecated: please use the alternative in x/swaprouter rpc EstimateSwapExactAmountOut(QuerySwapExactAmountOutRequest) returns (QuerySwapExactAmountOutResponse) { + option deprecated = true; option (google.api.http).get = "/osmosis/gamm/v1beta1/{pool_id}/estimate/swap_exact_amount_out"; } @@ -121,8 +126,9 @@ message QueryPoolsResponse { } //=============================== NumPools -message QueryNumPoolsRequest {} +message QueryNumPoolsRequest { option deprecated = true; } message QueryNumPoolsResponse { + option deprecated = true; uint64 num_pools = 1 [ (gogoproto.moretags) = "yaml:\"num_pools\"" ]; } @@ -257,7 +263,7 @@ message QuerySpotPriceResponse { //=============================== EstimateSwapExactAmountIn message QuerySwapExactAmountInRequest { - // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE + option deprecated = true; string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; string token_in = 3 [ (gogoproto.moretags) = "yaml:\"token_in\"" ]; @@ -268,6 +274,7 @@ message QuerySwapExactAmountInRequest { } message QuerySwapExactAmountInResponse { + option deprecated = true; string token_out_amount = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.moretags) = "yaml:\"token_out_amount\"", @@ -277,7 +284,7 @@ message QuerySwapExactAmountInResponse { //=============================== EstimateSwapExactAmountOut message QuerySwapExactAmountOutRequest { - // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE + option deprecated = true; string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ]; uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; repeated SwapAmountOutRoute routes = 3 [ @@ -288,6 +295,7 @@ message QuerySwapExactAmountOutRequest { } message QuerySwapExactAmountOutResponse { + option deprecated = true; string token_in_amount = 1 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", (gogoproto.moretags) = "yaml:\"token_in_amount\"", diff --git a/tests/e2e/configurer/chain/commands.go b/tests/e2e/configurer/chain/commands.go index 74025dc829e..9d780e74e40 100644 --- a/tests/e2e/configurer/chain/commands.go +++ b/tests/e2e/configurer/chain/commands.go @@ -30,6 +30,7 @@ func (n *NodeConfig) CreatePool(poolFile, from string) uint64 { bz, err := n.QueryGRPCGateway(path) require.NoError(n.t, err) + //nolint:staticcheck var numPools gammtypes.QueryNumPoolsResponse err = util.Cdc.UnmarshalJSON(bz, &numPools) require.NoError(n.t, err) diff --git a/wasmbinding/stargate_whitelist.go b/wasmbinding/stargate_whitelist.go index 9d36240cc45..d174a9bbc1a 100644 --- a/wasmbinding/stargate_whitelist.go +++ b/wasmbinding/stargate_whitelist.go @@ -35,6 +35,7 @@ import ( // thread safe sync.Map. var stargateWhitelist sync.Map +//nolint:staticcheck func init() { // cosmos-sdk queries diff --git a/x/concentrated-liquidity/model/pool.go b/x/concentrated-liquidity/model/pool.go index 32175a38a5f..0f16f7047ad 100644 --- a/x/concentrated-liquidity/model/pool.go +++ b/x/concentrated-liquidity/model/pool.go @@ -162,13 +162,16 @@ func (p *Pool) UpdateLiquidityIfActivePosition(ctx sdk.Context, lowerTick, upper // lower and upper ticks. // There are 3 possible cases: // -The position is active ( lowerTick <= p.CurrentTick < upperTick). -// * The provided liqudity is distributed in both tokens. -// * Actual amounts might differ from desired because we recalculate them from liquidity delta and sqrt price. -// the calculations lead to amounts being off. // TODO: confirm logic is correct +// - The provided liqudity is distributed in both tokens. +// - Actual amounts might differ from desired because we recalculate them from liquidity delta and sqrt price. +// the calculations lead to amounts being off. // TODO: confirm logic is correct +// // - Current tick is below the position ( p.CurrentTick < lowerTick). -// * The provided liquidity is distributed in token0 only. +// - The provided liquidity is distributed in token0 only. +// // - Current tick is above the position ( p.CurrentTick >= p.upperTick ). -// * The provided liquidity is distributed in token1 only. +// - The provided liquidity is distributed in token1 only. +// // TODO: add tests. func (p Pool) CalcActualAmounts(ctx sdk.Context, lowerTick, upperTick int64, sqrtRatioLowerTick, sqrtRatioUpperTick sdk.Dec, liquidityDelta sdk.Dec) (actualAmountDenom0 sdk.Dec, actualAmountDenom1 sdk.Dec) { if p.isCurrentTickInRange(lowerTick, upperTick) { diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index c83ae9534ba..e7887a94547 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -79,6 +79,7 @@ func GetCmdPools() (*osmocli.QueryDescriptor, *types.QueryPoolsRequest) { {{.CommandPrefix}} pools`}, &types.QueryPoolsRequest{} } +// nolint: staticcheck func GetCmdNumPools() *cobra.Command { return osmocli.SimpleQueryCmd[*types.QueryNumPoolsRequest]( "num-pools", @@ -195,6 +196,7 @@ func GetCmdSpotPrice() (*osmocli.QueryDescriptor, *types.QuerySpotPriceRequest) } // GetCmdEstimateSwapExactAmountIn returns estimation of output coin when amount of x token input. +// nolint: staticcheck func GetCmdEstimateSwapExactAmountIn() (*osmocli.QueryDescriptor, *types.QuerySwapExactAmountInRequest) { return &osmocli.QueryDescriptor{ Use: "estimate-swap-exact-amount-in ", @@ -207,6 +209,7 @@ func GetCmdEstimateSwapExactAmountIn() (*osmocli.QueryDescriptor, *types.QuerySw } // GetCmdEstimateSwapExactAmountOut returns estimation of input coin to get exact amount of x token output. +// nolint: staticcheck func GetCmdEstimateSwapExactAmountOut() (*osmocli.QueryDescriptor, *types.QuerySwapExactAmountOutRequest) { return &osmocli.QueryDescriptor{ Use: "estimate-swap-exact-amount-out ", @@ -218,6 +221,7 @@ func GetCmdEstimateSwapExactAmountOut() (*osmocli.QueryDescriptor, *types.QueryS }, &types.QuerySwapExactAmountOutRequest{} } +// nolint: staticcheck func EstimateSwapExactAmountInParseArgs(args []string, fs *flag.FlagSet) (proto.Message, error) { poolID, err := strconv.Atoi(args[0]) if err != nil { @@ -237,6 +241,7 @@ func EstimateSwapExactAmountInParseArgs(args []string, fs *flag.FlagSet) (proto. }, nil } +// nolint: staticcheck func EstimateSwapExactAmountOutParseArgs(args []string, fs *flag.FlagSet) (proto.Message, error) { poolID, err := strconv.Atoi(args[0]) if err != nil { diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 50b3c5479cc..4b4696bb686 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -109,7 +109,8 @@ func (q Querier) Pools( }, nil } -// TODO: mark deprecated and move to swaprouter. +// This query has been deprecated and has been moved to swaprouter module. +// nolint: staticcheck func (q Querier) NumPools(ctx context.Context, _ *types.QueryNumPoolsRequest) (*types.QueryNumPoolsResponse, error) { sdkCtx := sdk.UnwrapSDKContext(ctx) @@ -410,6 +411,8 @@ func (q Querier) TotalLiquidity(ctx context.Context, _ *types.QueryTotalLiquidit } // EstimateSwapExactAmountIn estimates input token amount for a swap. +// This query is deprecated and has been moved to swaprouter module. +// nolint: staticcheck func (q Querier) EstimateSwapExactAmountIn(ctx context.Context, req *types.QuerySwapExactAmountInRequest) (*types.QuerySwapExactAmountInResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "empty request") @@ -440,6 +443,8 @@ func (q Querier) EstimateSwapExactAmountIn(ctx context.Context, req *types.Query } // EstimateSwapExactAmountOut estimates token output amount for a swap. +// This query is deprecated and has been moved to swaprouter module. +// nolint: staticcheck func (q Querier) EstimateSwapExactAmountOut(ctx context.Context, req *types.QuerySwapExactAmountOutRequest) (*types.QuerySwapExactAmountOutResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "empty request") diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index d936a347bf0..4d0990f0e24 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -223,6 +223,8 @@ func (m *QueryPoolsResponse) GetPagination() *query.PageResponse { } // =============================== NumPools +// +// Deprecated: Do not use. type QueryNumPoolsRequest struct { } @@ -259,6 +261,7 @@ func (m *QueryNumPoolsRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryNumPoolsRequest proto.InternalMessageInfo +// Deprecated: Do not use. type QueryNumPoolsResponse struct { NumPools uint64 `protobuf:"varint,1,opt,name=num_pools,json=numPools,proto3" json:"num_pools,omitempty" yaml:"num_pools"` } @@ -1178,8 +1181,9 @@ func (m *QuerySpotPriceResponse) GetSpotPrice() string { } // =============================== EstimateSwapExactAmountIn +// +// Deprecated: Do not use. type QuerySwapExactAmountInRequest struct { - // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` PoolId uint64 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"` TokenIn string `protobuf:"bytes,3,opt,name=token_in,json=tokenIn,proto3" json:"token_in,omitempty" yaml:"token_in"` @@ -1247,6 +1251,7 @@ func (m *QuerySwapExactAmountInRequest) GetRoutes() []SwapAmountInRoute { return nil } +// Deprecated: Do not use. type QuerySwapExactAmountInResponse struct { TokenOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_out_amount,json=tokenOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_out_amount" yaml:"token_out_amount"` } @@ -1285,8 +1290,9 @@ func (m *QuerySwapExactAmountInResponse) XXX_DiscardUnknown() { var xxx_messageInfo_QuerySwapExactAmountInResponse proto.InternalMessageInfo // =============================== EstimateSwapExactAmountOut +// +// Deprecated: Do not use. type QuerySwapExactAmountOutRequest struct { - // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE Sender string `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty" yaml:"sender"` PoolId uint64 `protobuf:"varint,2,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"` Routes []SwapAmountOutRoute `protobuf:"bytes,3,rep,name=routes,proto3" json:"routes" yaml:"routes"` @@ -1354,6 +1360,7 @@ func (m *QuerySwapExactAmountOutRequest) GetTokenOut() string { return "" } +// Deprecated: Do not use. type QuerySwapExactAmountOutResponse struct { TokenInAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,1,opt,name=token_in_amount,json=tokenInAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"token_in_amount" yaml:"token_in_amount"` } @@ -1507,119 +1514,120 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) } var fileDescriptor_d9a717df9ca609ef = []byte{ - // 1790 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x49, 0x6c, 0x14, 0xc7, - 0x1a, 0x76, 0x8d, 0x17, 0x3c, 0x65, 0xbc, 0x15, 0x06, 0x86, 0xb1, 0x99, 0xe1, 0xd5, 0x03, 0xdb, - 0x80, 0xdd, 0x83, 0x17, 0xf4, 0x9e, 0xfc, 0x1e, 0x8b, 0x0d, 0x36, 0x8c, 0x15, 0xb0, 0xd3, 0x20, - 0x50, 0x92, 0xc3, 0xa8, 0x6d, 0x37, 0xe3, 0x86, 0x99, 0xae, 0xf6, 0x74, 0x35, 0xb6, 0x15, 0x21, - 0x24, 0x14, 0x45, 0x39, 0xe4, 0x10, 0x89, 0xc0, 0x21, 0x8a, 0x92, 0x1c, 0xa2, 0x28, 0xe2, 0x1c, - 0x29, 0xa7, 0x1c, 0xa2, 0x28, 0x12, 0x8a, 0x14, 0x89, 0x28, 0x97, 0x28, 0x87, 0x49, 0x04, 0xc9, - 0x2d, 0x27, 0x5f, 0x72, 0x4c, 0x54, 0x4b, 0x2f, 0xb3, 0x2f, 0x09, 0x12, 0x39, 0xcd, 0x74, 0xfd, - 0xdb, 0xf7, 0x2f, 0xf5, 0xd7, 0x5f, 0x05, 0x0f, 0x11, 0x3b, 0x4b, 0x6c, 0xc3, 0x4e, 0xa4, 0xb5, - 0x6c, 0x36, 0x71, 0x7b, 0x62, 0x45, 0xa7, 0xda, 0x44, 0x62, 0xc3, 0xd1, 0x73, 0xdb, 0x8a, 0x95, - 0x23, 0x94, 0xa0, 0x01, 0xc9, 0xa1, 0x30, 0x0e, 0x45, 0x72, 0x44, 0x07, 0xd2, 0x24, 0x4d, 0x38, - 0x43, 0x82, 0xfd, 0x13, 0xbc, 0xd1, 0x83, 0x65, 0xb5, 0xd1, 0x2d, 0x49, 0x8e, 0xad, 0x72, 0x7a, - 0x62, 0x45, 0xb3, 0x75, 0x8f, 0xba, 0x4a, 0x0c, 0x53, 0xd2, 0x8f, 0x05, 0xe9, 0x1c, 0x83, 0xc7, - 0x65, 0x69, 0x69, 0xc3, 0xd4, 0xa8, 0x41, 0x5c, 0xde, 0xa1, 0x34, 0x21, 0xe9, 0x8c, 0x9e, 0xd0, - 0x2c, 0x23, 0xa1, 0x99, 0x26, 0xa1, 0x9c, 0x68, 0x4b, 0xea, 0x01, 0x49, 0xe5, 0x5f, 0x2b, 0xce, - 0x8d, 0x84, 0x66, 0x6e, 0xbb, 0x24, 0x61, 0x24, 0x25, 0xc0, 0x8b, 0x0f, 0x41, 0xc2, 0x67, 0x60, - 0xdf, 0xcb, 0xcc, 0xea, 0x32, 0x21, 0x19, 0x55, 0xdf, 0x70, 0x74, 0x9b, 0xa2, 0xe3, 0x70, 0x97, - 0x45, 0x48, 0x26, 0x65, 0xac, 0x45, 0xc0, 0x21, 0x30, 0xda, 0x36, 0x87, 0x76, 0xf2, 0xf1, 0x9e, - 0x6d, 0x2d, 0x9b, 0x99, 0xc1, 0x92, 0x80, 0xd5, 0x0e, 0xf6, 0x2f, 0xb9, 0x86, 0x2f, 0xc2, 0xfe, - 0x80, 0x02, 0xdb, 0x22, 0xa6, 0xad, 0xa3, 0x29, 0xd8, 0xc6, 0xc8, 0x5c, 0xbc, 0x6b, 0x72, 0x40, - 0x11, 0xd0, 0x14, 0x17, 0x9a, 0x32, 0x6b, 0x6e, 0xcf, 0x85, 0xbf, 0xf9, 0x6c, 0xbc, 0x9d, 0x49, - 0x25, 0x55, 0xce, 0x8c, 0x5f, 0x0b, 0x68, 0xb2, 0x5d, 0x2c, 0x0b, 0x10, 0xfa, 0x71, 0x88, 0x84, - 0xb8, 0xbe, 0x61, 0x45, 0xba, 0xc0, 0x82, 0xa6, 0x88, 0xc4, 0xc9, 0xa0, 0x29, 0xcb, 0x5a, 0x5a, - 0x97, 0xb2, 0x6a, 0x40, 0x12, 0xbf, 0x0b, 0x20, 0x0a, 0x6a, 0x97, 0x40, 0x4f, 0xc2, 0x76, 0x66, - 0xdb, 0x8e, 0x80, 0x43, 0xad, 0xf5, 0x20, 0x15, 0xdc, 0xe8, 0x42, 0x19, 0x54, 0x23, 0x35, 0x51, - 0x09, 0x9b, 0x05, 0xb0, 0xf6, 0xc1, 0x01, 0x8e, 0xea, 0xb2, 0x93, 0x0d, 0xba, 0x8d, 0x17, 0xe1, - 0xde, 0xa2, 0x75, 0x09, 0x78, 0x02, 0x86, 0x4d, 0x27, 0x9b, 0x72, 0x41, 0xb3, 0xec, 0x0c, 0xec, - 0xe4, 0xe3, 0x7d, 0x22, 0x3b, 0x1e, 0x09, 0xab, 0x9d, 0xa6, 0x14, 0xc5, 0xe7, 0xa4, 0x0d, 0xf6, - 0x75, 0x75, 0xdb, 0xd2, 0x9b, 0x4a, 0xb3, 0x0b, 0xc8, 0x57, 0xe2, 0x03, 0xe2, 0xcc, 0x74, 0xdb, - 0xd2, 0xb9, 0x9e, 0x70, 0x10, 0x90, 0x47, 0xc2, 0x6a, 0xa7, 0x25, 0x45, 0xf1, 0xe7, 0x00, 0xc6, - 0xb8, 0xb2, 0x73, 0x5a, 0x66, 0x75, 0x91, 0x18, 0x26, 0x53, 0x7a, 0x65, 0x5d, 0xcb, 0xe9, 0x76, - 0x33, 0xd8, 0xd0, 0x3a, 0x0c, 0x53, 0x72, 0x4b, 0x37, 0xed, 0x94, 0xc1, 0x92, 0xc1, 0x12, 0x79, - 0xa0, 0x20, 0x19, 0x6e, 0x1a, 0xce, 0x11, 0xc3, 0x9c, 0x3b, 0xf1, 0x38, 0x1f, 0x6f, 0x79, 0xf4, - 0x53, 0x7c, 0x34, 0x6d, 0xd0, 0x75, 0x67, 0x45, 0x59, 0x25, 0x59, 0xb9, 0x25, 0xe4, 0xcf, 0xb8, - 0xbd, 0x76, 0x2b, 0xc1, 0x30, 0xdb, 0x5c, 0xc0, 0x56, 0x3b, 0x85, 0xf6, 0xa4, 0x89, 0xef, 0x85, - 0x60, 0xbc, 0x22, 0x72, 0x19, 0x10, 0x1b, 0xf6, 0xd9, 0x6c, 0x25, 0x45, 0x1c, 0x9a, 0xd2, 0xb2, - 0xc4, 0x31, 0xa9, 0x8c, 0x4b, 0x92, 0x59, 0xfe, 0x31, 0x1f, 0x1f, 0xae, 0xc3, 0x72, 0xd2, 0xa4, - 0x3b, 0xf9, 0xf8, 0x7e, 0xe1, 0x71, 0xb1, 0x3e, 0xac, 0xf6, 0xf0, 0xa5, 0x25, 0x87, 0xce, 0xf2, - 0x05, 0x74, 0x13, 0x42, 0x19, 0x02, 0xe2, 0xd0, 0xe7, 0x11, 0x03, 0x19, 0xe1, 0x25, 0x87, 0xe2, - 0xf7, 0x00, 0x1c, 0xf1, 0x82, 0x30, 0xbf, 0x65, 0x50, 0x16, 0x04, 0xce, 0xb5, 0x90, 0x23, 0xd9, - 0xc2, 0x3c, 0xee, 0x2f, 0xca, 0xa3, 0x97, 0xb3, 0x6b, 0xb0, 0x57, 0x78, 0x65, 0x98, 0x6e, 0x90, - 0x42, 0x3c, 0x48, 0x4a, 0x63, 0x41, 0x52, 0xbb, 0xb9, 0x9a, 0xa4, 0x29, 0x02, 0x81, 0x1f, 0x02, - 0x38, 0x5a, 0x1b, 0x9c, 0x4c, 0x55, 0x61, 0xd4, 0xc0, 0x73, 0x8d, 0xda, 0x3c, 0xdc, 0xe7, 0x6d, - 0xa0, 0x65, 0x2d, 0xa7, 0x65, 0x9b, 0xaa, 0x75, 0x7c, 0x01, 0xee, 0x2f, 0x51, 0x23, 0xbd, 0x19, - 0x83, 0x1d, 0x16, 0x5f, 0xa9, 0xd6, 0x76, 0x55, 0xc9, 0x83, 0x2f, 0xc9, 0x3d, 0x78, 0x95, 0x50, - 0x2d, 0xc3, 0xb4, 0xbd, 0x64, 0x6c, 0x38, 0xc6, 0x9a, 0x41, 0xb7, 0x9b, 0xc2, 0xf5, 0x11, 0x90, - 0x3b, 0xa3, 0x9c, 0x3e, 0x09, 0xf0, 0x0e, 0x0c, 0x67, 0xdc, 0xc5, 0xda, 0xd1, 0x3e, 0xcf, 0xa2, - 0xed, 0x77, 0x12, 0x4f, 0x12, 0x37, 0x96, 0x01, 0x5f, 0x6e, 0x41, 0x86, 0x8e, 0x23, 0x6c, 0xbe, - 0xdd, 0x60, 0x07, 0x46, 0x4a, 0xf5, 0x48, 0x17, 0x5f, 0x81, 0xbb, 0x29, 0x5b, 0x4e, 0xf1, 0xaa, - 0x74, 0x33, 0x51, 0xc5, 0xcb, 0x41, 0xe9, 0xe5, 0x1e, 0x61, 0x2c, 0x28, 0x8c, 0xd5, 0x2e, 0xea, - 0x9b, 0xc0, 0x5f, 0x00, 0x78, 0xb8, 0xa4, 0xf7, 0x5c, 0x26, 0x57, 0x36, 0x35, 0xeb, 0x1f, 0xd1, - 0x3b, 0x7f, 0x07, 0xf0, 0x48, 0x0d, 0xfc, 0x32, 0x88, 0x77, 0x1b, 0xdb, 0x96, 0xf3, 0x32, 0x84, - 0xfd, 0x6e, 0x08, 0x5d, 0x51, 0xdc, 0xe4, 0x5e, 0x45, 0x97, 0x20, 0x14, 0x29, 0x90, 0xdd, 0xb4, - 0x99, 0xbe, 0x14, 0x16, 0x1a, 0xd8, 0xd6, 0xff, 0x0d, 0xc8, 0xc3, 0xf3, 0x8a, 0x45, 0xe8, 0x72, - 0xce, 0x58, 0x6d, 0xea, 0x08, 0x46, 0xf3, 0xb0, 0x8f, 0x39, 0x9f, 0xd2, 0x6c, 0x5b, 0xa7, 0xa9, - 0x35, 0xdd, 0x24, 0x59, 0x89, 0x6d, 0xd0, 0x3f, 0x2a, 0x8a, 0x39, 0xb0, 0xda, 0xc3, 0x96, 0x66, - 0xd9, 0xca, 0x79, 0xb6, 0x80, 0x2e, 0xc2, 0xfe, 0x0d, 0x87, 0xd0, 0x42, 0x3d, 0xad, 0x5c, 0xcf, - 0xd0, 0x4e, 0x3e, 0x1e, 0x11, 0x7a, 0x4a, 0x58, 0xb0, 0xda, 0xcb, 0xd7, 0x7c, 0x4d, 0x33, 0xa1, - 0x08, 0x58, 0x6c, 0xeb, 0x6c, 0xeb, 0x6b, 0x57, 0xbb, 0x36, 0x0d, 0xba, 0xce, 0x32, 0xb9, 0xa0, - 0xeb, 0xf8, 0x4b, 0x00, 0x07, 0xfd, 0x51, 0xeb, 0xba, 0x41, 0xd7, 0x17, 0x8c, 0x0c, 0xd5, 0x73, - 0xae, 0xd3, 0xa7, 0x60, 0x77, 0xd6, 0x30, 0x53, 0xc1, 0x56, 0xc0, 0x8c, 0x47, 0x76, 0xf2, 0xf1, - 0x01, 0x61, 0xbc, 0x80, 0x8c, 0xd5, 0xdd, 0x59, 0xc3, 0xf4, 0xba, 0x09, 0x1a, 0x0c, 0x0e, 0x1c, - 0xdc, 0x7f, 0x7f, 0xb4, 0x28, 0x1a, 0x17, 0x5b, 0x9b, 0x1e, 0x17, 0x3f, 0x00, 0x70, 0xa8, 0xbc, - 0x0f, 0x2f, 0xc8, 0xe0, 0xa8, 0xca, 0xe3, 0x24, 0x50, 0x52, 0x12, 0xd9, 0x34, 0x84, 0xb6, 0x45, - 0x68, 0xca, 0x62, 0xab, 0x32, 0xb6, 0x7b, 0xfd, 0xed, 0xe1, 0xd3, 0xb0, 0x1a, 0xb6, 0x5d, 0x69, - 0x96, 0x4b, 0xfc, 0x07, 0x80, 0x07, 0x85, 0xd2, 0x4d, 0xcd, 0x9a, 0xdf, 0xd2, 0x56, 0xe5, 0x74, - 0x91, 0x34, 0xdd, 0xd4, 0x1d, 0x85, 0x1d, 0xb6, 0x6e, 0xae, 0xe9, 0x39, 0xa9, 0xb7, 0x7f, 0x27, - 0x1f, 0xef, 0x96, 0x7a, 0xf9, 0x3a, 0x56, 0x25, 0x43, 0xb0, 0xb4, 0x43, 0x35, 0x4b, 0x5b, 0x81, - 0xa2, 0x4f, 0xb0, 0x26, 0x24, 0x4a, 0x71, 0xcf, 0x4e, 0x3e, 0xde, 0x1b, 0xd8, 0xd0, 0x29, 0xc3, - 0xc4, 0xea, 0x2e, 0xfe, 0x37, 0x69, 0xa2, 0x6b, 0xb0, 0x23, 0x47, 0x1c, 0xaa, 0xdb, 0x91, 0x36, - 0x1e, 0xfe, 0x11, 0xa5, 0xdc, 0x8d, 0x4d, 0x61, 0x7e, 0x78, 0x2e, 0x30, 0xfe, 0xb9, 0xbd, 0xb2, - 0x57, 0x48, 0xd0, 0x42, 0x09, 0x56, 0xa5, 0x36, 0xfc, 0xc0, 0x9d, 0x4c, 0xcb, 0x44, 0xc0, 0x1f, - 0xef, 0x04, 0xa0, 0xbf, 0x6f, 0xbc, 0x2b, 0xd6, 0x87, 0xd5, 0x1e, 0xbe, 0xe4, 0x8d, 0x77, 0xf8, - 0x8d, 0x50, 0x79, 0x5c, 0x4b, 0x0e, 0x7d, 0xde, 0xa9, 0xb9, 0xee, 0x85, 0xba, 0x95, 0x87, 0x7a, - 0xb4, 0x56, 0xa8, 0x19, 0xa6, 0x3a, 0x62, 0xcd, 0x2e, 0x0e, 0x9e, 0xe3, 0x91, 0xb6, 0xe2, 0x8b, - 0x83, 0x47, 0xc2, 0xf2, 0x08, 0x61, 0x8d, 0xf4, 0xbe, 0x3b, 0x64, 0x94, 0x0b, 0x83, 0xcc, 0x8f, - 0x05, 0x7b, 0xdd, 0x82, 0x29, 0x4c, 0xcf, 0xc5, 0x86, 0xd3, 0xb3, 0xaf, 0xb0, 0xfe, 0xbc, 0xec, - 0x74, 0xcb, 0x32, 0x94, 0xc9, 0x19, 0x82, 0x51, 0x7f, 0x1e, 0x28, 0x9e, 0xa2, 0xf0, 0xfb, 0x6e, - 0x37, 0x2c, 0x26, 0xbf, 0x10, 0x43, 0xd1, 0xe4, 0xa3, 0x01, 0xd8, 0xce, 0xe1, 0xa1, 0xbb, 0x90, - 0xb7, 0x2a, 0x1b, 0x55, 0xd8, 0x4c, 0x25, 0x77, 0xf3, 0xe8, 0x68, 0x6d, 0x46, 0xe1, 0x24, 0xfe, - 0xf7, 0xbd, 0xef, 0x7f, 0xb9, 0x1f, 0x3a, 0x88, 0x06, 0x13, 0x65, 0x5f, 0x4b, 0x44, 0x6f, 0x7c, - 0x1b, 0xc0, 0x4e, 0xf7, 0xbe, 0x8b, 0x8e, 0x55, 0xd1, 0x5d, 0x74, 0x59, 0x8e, 0x1e, 0xaf, 0x8b, - 0x57, 0x42, 0x19, 0xe1, 0x50, 0xfe, 0x85, 0xe2, 0xe5, 0xa1, 0x78, 0x37, 0x68, 0xf4, 0x31, 0x80, - 0x3d, 0x85, 0x39, 0x43, 0x27, 0xaa, 0x18, 0x2a, 0x9b, 0xfd, 0xe8, 0x44, 0x03, 0x12, 0x12, 0xe0, - 0x38, 0x07, 0x38, 0x82, 0x8e, 0x94, 0x07, 0x28, 0x26, 0x44, 0x2f, 0x81, 0xe8, 0x13, 0x00, 0x7b, - 0x8b, 0x0e, 0x29, 0x34, 0x51, 0x2b, 0x31, 0x25, 0x87, 0x72, 0x74, 0xb2, 0x11, 0x11, 0x89, 0x74, - 0x8c, 0x23, 0x1d, 0x46, 0x87, 0xcb, 0x23, 0xbd, 0xc1, 0xb9, 0xf5, 0x35, 0x19, 0xcf, 0x37, 0x01, - 0x6c, 0x63, 0x9a, 0xd0, 0x70, 0x0d, 0x53, 0x2e, 0xa4, 0x91, 0x9a, 0x7c, 0xf5, 0x45, 0x8c, 0x9b, - 0x4f, 0xbc, 0x2e, 0x3b, 0xdb, 0x1d, 0xf4, 0x10, 0xc0, 0x4e, 0xf7, 0x19, 0xa3, 0x6a, 0x9d, 0x15, - 0x3d, 0x98, 0x54, 0xad, 0xb3, 0xe2, 0x77, 0x11, 0x3c, 0xc1, 0x41, 0x1d, 0x47, 0x47, 0x2b, 0x83, - 0xe2, 0x23, 0x4c, 0x00, 0xd8, 0x03, 0x00, 0x23, 0x95, 0x86, 0x63, 0x34, 0x53, 0xc5, 0x78, 0x8d, - 0x1b, 0x41, 0xf4, 0x7f, 0x4d, 0xc9, 0x4a, 0x47, 0x5a, 0xd0, 0x57, 0x00, 0xa2, 0xd2, 0x07, 0x0f, - 0x34, 0x5d, 0xa7, 0xd6, 0x42, 0x2c, 0x27, 0x1b, 0x94, 0x92, 0x28, 0xce, 0xf2, 0x70, 0xce, 0xa0, - 0xff, 0xd6, 0x95, 0xe3, 0xc4, 0x4d, 0x62, 0x98, 0x29, 0x7b, 0x53, 0xb3, 0x52, 0x3a, 0x3b, 0x26, - 0x52, 0x86, 0x89, 0x7e, 0x05, 0x70, 0xb0, 0xca, 0xa3, 0x00, 0x3a, 0x55, 0x03, 0x58, 0xf5, 0x97, - 0x8e, 0xe8, 0xe9, 0x66, 0xc5, 0xa5, 0x83, 0x17, 0xb8, 0x83, 0xb3, 0xe8, 0x4c, 0x7d, 0x0e, 0xea, - 0x5b, 0x06, 0x15, 0x0e, 0x8a, 0x67, 0x14, 0x71, 0x36, 0x31, 0x3f, 0x3f, 0x04, 0x10, 0xfa, 0xaf, - 0x03, 0x68, 0xac, 0x46, 0xd1, 0x16, 0xbc, 0x45, 0x44, 0xc7, 0xeb, 0xe4, 0x96, 0xa0, 0xa7, 0x39, - 0x68, 0x05, 0x8d, 0xd5, 0x07, 0x5a, 0x3c, 0x3d, 0xa0, 0xaf, 0x01, 0x44, 0xa5, 0xcf, 0x04, 0x55, - 0xeb, 0xa9, 0xe2, 0x2b, 0x45, 0xd5, 0x7a, 0xaa, 0xfc, 0x16, 0x81, 0xe7, 0x38, 0xf2, 0xff, 0xa3, - 0x99, 0xfa, 0x90, 0x8b, 0xae, 0xcb, 0x3f, 0xfd, 0xd6, 0xfb, 0x29, 0x80, 0x5d, 0x81, 0x47, 0x00, - 0x34, 0x5e, 0x0b, 0x4a, 0x61, 0xc5, 0x28, 0xf5, 0xb2, 0x4b, 0xc8, 0x33, 0x1c, 0xf2, 0x34, 0x9a, - 0x6c, 0x04, 0xb2, 0xb8, 0x85, 0xb2, 0xa2, 0x08, 0x7b, 0x57, 0x05, 0x54, 0xad, 0x91, 0x15, 0xdf, - 0x51, 0xa3, 0x63, 0xf5, 0x31, 0x4b, 0x90, 0xff, 0x69, 0xb0, 0x22, 0x98, 0xb0, 0xfd, 0x56, 0x08, - 0xa0, 0x6f, 0x01, 0x3c, 0x30, 0x6f, 0x53, 0x23, 0xab, 0x51, 0xbd, 0x64, 0xfa, 0x46, 0x53, 0xd5, - 0x40, 0x54, 0xb8, 0xad, 0x44, 0xa7, 0x1b, 0x13, 0x92, 0x1e, 0xcc, 0x73, 0x0f, 0xce, 0xa0, 0x53, - 0xe5, 0x3d, 0x08, 0x6c, 0x41, 0x89, 0x36, 0x11, 0xe8, 0x33, 0xfe, 0x36, 0xfc, 0x0e, 0xc0, 0x68, - 0x05, 0x7f, 0x96, 0x1c, 0x8a, 0x1a, 0xc0, 0xe6, 0x0f, 0xf9, 0x55, 0x8b, 0xbd, 0xf2, 0x4c, 0x8c, - 0x17, 0xb8, 0x4b, 0x67, 0xd1, 0xe9, 0xbf, 0xe0, 0x12, 0x71, 0xe8, 0xdc, 0xe2, 0xe3, 0xa7, 0x31, - 0xf0, 0xe4, 0x69, 0x0c, 0xfc, 0xfc, 0x34, 0x06, 0xde, 0x79, 0x16, 0x6b, 0x79, 0xf2, 0x2c, 0xd6, - 0xf2, 0xc3, 0xb3, 0x58, 0xcb, 0xab, 0x27, 0x02, 0xb3, 0xa7, 0xb4, 0x31, 0x9e, 0xd1, 0x56, 0x6c, - 0xcf, 0xe0, 0xed, 0x89, 0xa9, 0xc4, 0x96, 0x30, 0xcb, 0x27, 0xd1, 0x95, 0x0e, 0x7e, 0x53, 0x9e, - 0xfa, 0x33, 0x00, 0x00, 0xff, 0xff, 0xe7, 0xbd, 0xae, 0x24, 0x8e, 0x1b, 0x00, 0x00, + // 1806 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x49, 0x6c, 0x1c, 0xc5, + 0x1a, 0x76, 0x8d, 0x97, 0x78, 0xca, 0xf1, 0x56, 0x71, 0x92, 0xc9, 0xd8, 0x99, 0xc9, 0xab, 0x97, + 0xd8, 0x4e, 0x62, 0xf7, 0xc4, 0x4b, 0xf4, 0x9e, 0xfc, 0x5e, 0x16, 0x3b, 0xb1, 0xe3, 0xb1, 0x5e, + 0x62, 0xbf, 0x4e, 0x94, 0x08, 0x38, 0x8c, 0xda, 0x76, 0x67, 0xdc, 0xc9, 0x4c, 0x57, 0x7b, 0xba, + 0x3a, 0xb6, 0x85, 0xa2, 0x48, 0x41, 0x42, 0xb9, 0x81, 0x04, 0x04, 0x81, 0x10, 0x70, 0x40, 0x08, + 0x71, 0x05, 0x89, 0x13, 0x07, 0x84, 0x90, 0x22, 0x4e, 0x91, 0xe0, 0x80, 0x38, 0x0c, 0x28, 0x81, + 0x1b, 0x27, 0x5f, 0xb8, 0xa2, 0x5a, 0x7a, 0x99, 0x7d, 0x81, 0x48, 0xe1, 0x64, 0x4f, 0xfd, 0x4b, + 0x7d, 0xff, 0xf7, 0xff, 0xf5, 0xf7, 0x5f, 0x05, 0x8f, 0x10, 0x3b, 0x4b, 0x6c, 0xc3, 0x4e, 0xa4, + 0xb5, 0x6c, 0x36, 0x71, 0x67, 0x62, 0x55, 0xa7, 0xda, 0x44, 0x62, 0xd3, 0xd1, 0x73, 0x3b, 0x8a, + 0x95, 0x23, 0x94, 0xa0, 0x01, 0xa9, 0xa1, 0x30, 0x0d, 0x45, 0x6a, 0x44, 0x07, 0xd2, 0x24, 0x4d, + 0xb8, 0x42, 0x82, 0xfd, 0x27, 0x74, 0xa3, 0x87, 0xcb, 0x7a, 0xa3, 0xdb, 0x52, 0x1c, 0x5b, 0xe3, + 0xf2, 0xc4, 0xaa, 0x66, 0xeb, 0x9e, 0x74, 0x8d, 0x18, 0xa6, 0x94, 0x9f, 0x08, 0xca, 0x39, 0x06, + 0x4f, 0xcb, 0xd2, 0xd2, 0x86, 0xa9, 0x51, 0x83, 0xb8, 0xba, 0x43, 0x69, 0x42, 0xd2, 0x19, 0x3d, + 0xa1, 0x59, 0x46, 0x42, 0x33, 0x4d, 0x42, 0xb9, 0xd0, 0x96, 0xd2, 0x43, 0x52, 0xca, 0x7f, 0xad, + 0x3a, 0x37, 0x13, 0x9a, 0xb9, 0xe3, 0x8a, 0xc4, 0x26, 0x29, 0x01, 0x5e, 0xfc, 0x10, 0x22, 0x7c, + 0x0e, 0xf6, 0xfd, 0x9f, 0xed, 0xba, 0x42, 0x48, 0x46, 0xd5, 0x37, 0x1d, 0xdd, 0xa6, 0xe8, 0x24, + 0xdc, 0x63, 0x11, 0x92, 0x49, 0x19, 0xeb, 0x11, 0x70, 0x04, 0x8c, 0xb6, 0xcd, 0xa1, 0xdd, 0x7c, + 0xbc, 0x67, 0x47, 0xcb, 0x66, 0x66, 0xb0, 0x14, 0x60, 0xb5, 0x83, 0xfd, 0x97, 0x5c, 0xc7, 0x8b, + 0xb0, 0x3f, 0xe0, 0xc0, 0xb6, 0x88, 0x69, 0xeb, 0x68, 0x0a, 0xb6, 0x31, 0x31, 0x37, 0xef, 0x9a, + 0x1c, 0x50, 0x04, 0x34, 0xc5, 0x85, 0xa6, 0xcc, 0x9a, 0x3b, 0x73, 0xe1, 0x6f, 0x3f, 0x1f, 0x6f, + 0x67, 0x56, 0x49, 0x95, 0x2b, 0xe3, 0x97, 0x02, 0x9e, 0x6c, 0x17, 0xcb, 0x02, 0x84, 0x3e, 0x0f, + 0x91, 0x10, 0xf7, 0x37, 0xac, 0xc8, 0x10, 0x18, 0x69, 0x8a, 0x48, 0x9c, 0x24, 0x4d, 0x59, 0xd1, + 0xd2, 0xba, 0xb4, 0x55, 0x03, 0x96, 0xf8, 0x4d, 0x00, 0x51, 0xd0, 0xbb, 0x04, 0x7a, 0x1a, 0xb6, + 0xb3, 0xbd, 0xed, 0x08, 0x38, 0xd2, 0x5a, 0x0f, 0x52, 0xa1, 0x8d, 0x2e, 0x95, 0x41, 0x35, 0x52, + 0x13, 0x95, 0xd8, 0xb3, 0x00, 0x56, 0x14, 0x0e, 0x70, 0x54, 0x57, 0x9c, 0x6c, 0x30, 0xec, 0x99, + 0x50, 0x04, 0xe0, 0x2b, 0x70, 0x7f, 0x91, 0x4c, 0x82, 0x9e, 0x80, 0x61, 0xd3, 0xc9, 0xa6, 0x5c, + 0xe0, 0x2c, 0x43, 0x03, 0xbb, 0xf9, 0x78, 0x9f, 0xc8, 0x90, 0x27, 0xc2, 0x6a, 0xa7, 0x29, 0x4d, + 0xb9, 0xbf, 0x0b, 0x72, 0x2f, 0xb6, 0x72, 0x6d, 0xc7, 0xd2, 0x9b, 0x4a, 0xf7, 0x92, 0x04, 0xe5, + 0x3b, 0xf1, 0x41, 0x71, 0x65, 0xba, 0x63, 0xe9, 0xdc, 0x4f, 0x38, 0x08, 0xca, 0x13, 0x61, 0xb5, + 0xd3, 0x92, 0xa6, 0xf8, 0x0b, 0x00, 0x63, 0xdc, 0xd9, 0x05, 0x2d, 0xb3, 0xb6, 0x44, 0x0c, 0x93, + 0x39, 0xbd, 0xba, 0xa1, 0xe5, 0x74, 0xbb, 0x19, 0x6c, 0x68, 0x03, 0x86, 0x29, 0xb9, 0xad, 0x9b, + 0x76, 0xca, 0x60, 0x49, 0x61, 0x09, 0x3d, 0x54, 0x90, 0x14, 0x37, 0x1d, 0x17, 0x88, 0x61, 0xce, + 0x9d, 0x7a, 0x94, 0x8f, 0xb7, 0x7c, 0xfa, 0x53, 0x7c, 0x34, 0x6d, 0xd0, 0x0d, 0x67, 0x55, 0x59, + 0x23, 0x59, 0x79, 0x34, 0xe4, 0x9f, 0x71, 0x7b, 0xfd, 0x76, 0x82, 0x61, 0xb6, 0xb9, 0x81, 0xad, + 0x76, 0x0a, 0xef, 0x49, 0x13, 0xdf, 0x0f, 0xc1, 0x78, 0x45, 0xe4, 0x92, 0x10, 0x1b, 0xf6, 0xd9, + 0x6c, 0x25, 0x45, 0x1c, 0x9a, 0xd2, 0xb2, 0xc4, 0x31, 0xa9, 0xe4, 0x25, 0xc9, 0x76, 0xfe, 0x31, + 0x1f, 0x1f, 0xae, 0x63, 0xe7, 0xa4, 0x49, 0x77, 0xf3, 0xf1, 0x83, 0x22, 0xe2, 0x62, 0x7f, 0x58, + 0xed, 0xe1, 0x4b, 0xcb, 0x0e, 0x9d, 0xe5, 0x0b, 0xe8, 0x16, 0x84, 0x92, 0x02, 0xe2, 0xd0, 0x67, + 0xc1, 0x81, 0x64, 0x78, 0xd9, 0xa1, 0xf8, 0x5d, 0x00, 0x47, 0x3c, 0x12, 0xe6, 0xb7, 0x0d, 0xca, + 0x48, 0xe0, 0x5a, 0x0b, 0x39, 0x92, 0x2d, 0xcc, 0xe3, 0xc1, 0xa2, 0x3c, 0x7a, 0x39, 0xbb, 0x0e, + 0x7b, 0x45, 0x54, 0x86, 0xe9, 0x92, 0x14, 0xe2, 0x24, 0x29, 0x8d, 0x91, 0xa4, 0x76, 0x73, 0x37, + 0x49, 0x53, 0x10, 0x81, 0x1f, 0x02, 0x38, 0x5a, 0x1b, 0x9c, 0x4c, 0x55, 0x21, 0x6b, 0xe0, 0x99, + 0xb2, 0x36, 0x0f, 0x0f, 0x78, 0x07, 0x68, 0x45, 0xcb, 0x69, 0xd9, 0xa6, 0x6a, 0x1d, 0x5f, 0x82, + 0x07, 0x4b, 0xdc, 0xc8, 0x68, 0xc6, 0x60, 0x87, 0xc5, 0x57, 0xaa, 0xb5, 0x5f, 0x55, 0xea, 0xe0, + 0xcb, 0xf2, 0x0c, 0x5e, 0x23, 0x54, 0xcb, 0x30, 0x6f, 0xff, 0x33, 0x36, 0x1d, 0x63, 0xdd, 0xa0, + 0x3b, 0x4d, 0xe1, 0xfa, 0x10, 0xc8, 0x93, 0x51, 0xce, 0x9f, 0x04, 0x78, 0x17, 0x86, 0x33, 0xee, + 0x62, 0x6d, 0xb6, 0x2f, 0x32, 0xb6, 0xfd, 0x4e, 0xe2, 0x59, 0xe2, 0xc6, 0x32, 0xe0, 0xdb, 0x2d, + 0x48, 0xea, 0x38, 0xc2, 0xe6, 0xdb, 0x0d, 0x76, 0x60, 0xa4, 0xd4, 0x8f, 0x0c, 0xf1, 0x05, 0xb8, + 0x97, 0xb2, 0xe5, 0x14, 0xaf, 0x4a, 0x37, 0x13, 0x55, 0xa2, 0x1c, 0x94, 0x51, 0xee, 0x13, 0x9b, + 0x05, 0x8d, 0xb1, 0xda, 0x45, 0xfd, 0x2d, 0xf0, 0x97, 0x00, 0x1e, 0x2d, 0xe9, 0x3d, 0x57, 0xc8, + 0xd5, 0x2d, 0xcd, 0xfa, 0x5b, 0xf4, 0xce, 0xdf, 0x01, 0x3c, 0x56, 0x03, 0xbf, 0x24, 0xf1, 0x5e, + 0x63, 0xc7, 0x72, 0x5e, 0x52, 0xd8, 0xef, 0x52, 0xe8, 0x9a, 0xe2, 0x26, 0xcf, 0x2a, 0xba, 0x0c, + 0xa1, 0x48, 0x81, 0xec, 0xa6, 0xcd, 0xf4, 0xa5, 0xb0, 0xf0, 0xc0, 0x8e, 0xfe, 0x6f, 0x40, 0x7e, + 0x3c, 0xaf, 0x5a, 0x84, 0xae, 0xe4, 0x8c, 0xb5, 0xa6, 0x3e, 0xc1, 0x68, 0x1e, 0xf6, 0xb1, 0xe0, + 0x53, 0x9a, 0x6d, 0xeb, 0x34, 0xb5, 0xae, 0x9b, 0x24, 0x2b, 0xb1, 0x0d, 0xfa, 0x9f, 0x8a, 0x62, + 0x0d, 0xac, 0xf6, 0xb0, 0xa5, 0x59, 0xb6, 0x72, 0x91, 0x2d, 0xa0, 0x45, 0xd8, 0xbf, 0xe9, 0x10, + 0x5a, 0xe8, 0xa7, 0x95, 0xfb, 0x19, 0xda, 0xcd, 0xc7, 0x23, 0xc2, 0x4f, 0x89, 0x0a, 0x56, 0x7b, + 0xf9, 0x9a, 0xef, 0x89, 0x0d, 0x17, 0x4b, 0x6d, 0x9d, 0x6d, 0x7d, 0xed, 0x6a, 0xd7, 0x96, 0x41, + 0x37, 0x58, 0x26, 0x17, 0x74, 0x1d, 0x7f, 0x05, 0xe0, 0xa0, 0x3f, 0x72, 0xdd, 0x30, 0xe8, 0xc6, + 0x82, 0x91, 0xa1, 0x7a, 0xce, 0x0d, 0xfa, 0x0c, 0xec, 0xce, 0x1a, 0x66, 0x2a, 0xd8, 0x0a, 0xd8, + 0xe6, 0x91, 0xdd, 0x7c, 0x7c, 0x40, 0x6c, 0x5e, 0x20, 0xc6, 0xea, 0xde, 0xac, 0x61, 0x7a, 0xdd, + 0x04, 0x0d, 0x06, 0x07, 0x0e, 0x1e, 0xbf, 0x3f, 0x5a, 0x14, 0x8d, 0x8d, 0xad, 0x4d, 0x8f, 0x8d, + 0xef, 0x03, 0x38, 0x54, 0x3e, 0x86, 0xe7, 0x64, 0x80, 0x54, 0xe5, 0xe7, 0x24, 0x50, 0x52, 0x12, + 0xd9, 0x34, 0x84, 0xb6, 0x45, 0x68, 0xca, 0x62, 0xab, 0x92, 0xdb, 0xfd, 0xfe, 0xf1, 0xf0, 0x65, + 0x58, 0x0d, 0xdb, 0xae, 0x35, 0x1f, 0x14, 0x5f, 0x09, 0xc1, 0xc3, 0xc2, 0xe9, 0x96, 0x66, 0xcd, + 0x6f, 0x6b, 0x6b, 0x72, 0xba, 0x48, 0x9a, 0x6e, 0xea, 0x8e, 0xc3, 0x0e, 0x5b, 0x37, 0xd7, 0xf5, + 0x9c, 0xf4, 0xdb, 0xbf, 0x9b, 0x8f, 0x77, 0x4b, 0xbf, 0x7c, 0x1d, 0xab, 0x52, 0x21, 0x58, 0xda, + 0xa1, 0x9a, 0xa5, 0xad, 0x40, 0xd1, 0x27, 0x58, 0x13, 0x12, 0xa5, 0xb8, 0x6f, 0x37, 0x1f, 0xef, + 0x0d, 0x1c, 0xe8, 0x94, 0x61, 0x62, 0x75, 0x0f, 0xff, 0x37, 0x69, 0xa2, 0xeb, 0xb0, 0x23, 0x47, + 0x1c, 0xaa, 0xdb, 0x91, 0x36, 0x4e, 0xff, 0x88, 0x52, 0xee, 0xe6, 0xa6, 0xb0, 0x38, 0xbc, 0x10, + 0x98, 0xfe, 0xdc, 0x7e, 0xd9, 0x2b, 0x24, 0x68, 0xe1, 0x04, 0xab, 0xd2, 0x1b, 0x67, 0xe1, 0x1d, + 0x77, 0x3a, 0x2d, 0xc3, 0x82, 0x3f, 0xe2, 0x09, 0x50, 0x7f, 0xdd, 0x88, 0x57, 0xec, 0x0f, 0xab, + 0x3d, 0x7c, 0xc9, 0x1b, 0xf1, 0x38, 0xb6, 0x07, 0xa1, 0xf2, 0xd8, 0x96, 0x1d, 0xfa, 0xac, 0x53, + 0x74, 0xc3, 0xa3, 0xbc, 0x95, 0x53, 0x3e, 0x5a, 0x8b, 0x72, 0x86, 0xa9, 0x0e, 0xce, 0xd9, 0x05, + 0xc2, 0x0b, 0x3e, 0xd2, 0x56, 0x7c, 0x81, 0xf0, 0x44, 0x58, 0x7e, 0x4a, 0x96, 0x1d, 0x41, 0xc5, + 0xdb, 0xee, 0xc0, 0x51, 0x8e, 0x0a, 0x99, 0x27, 0x0b, 0xf6, 0xba, 0xc5, 0x53, 0x98, 0xa6, 0xc5, + 0x86, 0xd3, 0x74, 0xa0, 0xb0, 0x16, 0xbd, 0x2c, 0x75, 0xcb, 0x92, 0x0c, 0x24, 0x69, 0x08, 0x46, + 0xfd, 0xf9, 0xa0, 0x78, 0xaa, 0xc2, 0xef, 0xb9, 0xdd, 0xb1, 0x58, 0xfc, 0x5c, 0x0c, 0x49, 0x93, + 0x9f, 0x0d, 0xc0, 0x76, 0x0e, 0x0f, 0xdd, 0x83, 0xbc, 0x75, 0xd9, 0xa8, 0xc2, 0xe1, 0x2a, 0xb9, + 0xb3, 0x47, 0x47, 0x6b, 0x2b, 0x8a, 0x20, 0xf1, 0x3f, 0xef, 0x7f, 0xf7, 0xcb, 0x1b, 0xa1, 0xc3, + 0x68, 0x30, 0x51, 0xf6, 0x15, 0x45, 0xf4, 0xca, 0xd7, 0x00, 0xec, 0x74, 0xef, 0xc0, 0xe8, 0x44, + 0x15, 0xdf, 0x45, 0x97, 0xe8, 0xe8, 0xc9, 0xba, 0x74, 0x25, 0x94, 0x13, 0x1c, 0xca, 0x3f, 0x50, + 0xbc, 0x3c, 0x14, 0xef, 0x56, 0xfd, 0x20, 0x04, 0xd0, 0x47, 0x00, 0xf6, 0x14, 0xa6, 0x0d, 0x9d, + 0xaa, 0xb2, 0x57, 0xd9, 0x02, 0x88, 0x4e, 0x34, 0x60, 0x21, 0x31, 0x8e, 0x73, 0x8c, 0x23, 0xe8, + 0x58, 0x79, 0x8c, 0x62, 0x68, 0xf4, 0x72, 0x88, 0x3e, 0x06, 0xb0, 0xb7, 0xe8, 0xbb, 0x85, 0x26, + 0x6a, 0xe5, 0xa6, 0xe4, 0x3b, 0x1d, 0x9d, 0x6c, 0xc4, 0x44, 0x22, 0x1d, 0xe3, 0x48, 0x87, 0xd1, + 0xd1, 0xf2, 0x48, 0x6f, 0x72, 0x6d, 0x7d, 0x5d, 0x50, 0x8a, 0x5e, 0x05, 0xb0, 0x8d, 0x79, 0x42, + 0xc3, 0x35, 0xb6, 0x72, 0x21, 0x8d, 0xd4, 0xd4, 0xab, 0x8f, 0x31, 0xbe, 0x7d, 0xe2, 0x65, 0xd9, + 0xe4, 0xee, 0xa2, 0x87, 0x00, 0x76, 0xba, 0x2f, 0x1b, 0x55, 0x4b, 0xad, 0xe8, 0x0d, 0xa5, 0x6a, + 0xa9, 0x15, 0x3f, 0x95, 0xe0, 0x09, 0x0e, 0xea, 0x24, 0x3a, 0x5e, 0x19, 0x14, 0x9f, 0x6a, 0x02, + 0xc0, 0xde, 0x02, 0x30, 0x52, 0x69, 0x5e, 0x46, 0x33, 0x55, 0x36, 0xaf, 0x71, 0x49, 0x88, 0xfe, + 0xa7, 0x29, 0x5b, 0x19, 0x48, 0x0b, 0xfa, 0x1a, 0x40, 0x54, 0xfa, 0x06, 0x82, 0xa6, 0xeb, 0xf4, + 0x5a, 0x88, 0xe5, 0x74, 0x83, 0x56, 0x12, 0xc5, 0x79, 0x4e, 0xe7, 0x0c, 0xfa, 0x77, 0x5d, 0x39, + 0x4e, 0xdc, 0x22, 0x86, 0x99, 0xb2, 0xb7, 0x34, 0x2b, 0xa5, 0xb3, 0xaf, 0x45, 0xca, 0x30, 0xd1, + 0xaf, 0x00, 0x0e, 0x56, 0x79, 0x27, 0x40, 0x67, 0x6a, 0x00, 0xab, 0xfe, 0xf8, 0x11, 0x3d, 0xdb, + 0xac, 0xb9, 0x0c, 0xf0, 0x12, 0x0f, 0x70, 0x16, 0x9d, 0xab, 0x2f, 0x40, 0x7d, 0xdb, 0xa0, 0x22, + 0x40, 0xf1, 0xb2, 0x22, 0x3e, 0x51, 0x2c, 0xce, 0x0f, 0x00, 0x84, 0xfe, 0x83, 0x01, 0x1a, 0xab, + 0x51, 0xb4, 0x05, 0xcf, 0x13, 0xd1, 0xf1, 0x3a, 0xb5, 0x25, 0xe8, 0x69, 0x0e, 0x5a, 0x41, 0x63, + 0xf5, 0x81, 0x16, 0xaf, 0x11, 0xe8, 0x1b, 0x00, 0x51, 0xe9, 0xcb, 0x41, 0xd5, 0x7a, 0xaa, 0xf8, + 0x70, 0x51, 0xb5, 0x9e, 0x2a, 0x3f, 0x4f, 0xe0, 0x39, 0x8e, 0xfc, 0xbf, 0x68, 0xa6, 0x3e, 0xe4, + 0xa2, 0xeb, 0xf2, 0x9f, 0x7e, 0xeb, 0xfd, 0x04, 0xc0, 0xae, 0xc0, 0xbb, 0x00, 0x1a, 0xaf, 0x05, + 0xa5, 0xb0, 0x62, 0x94, 0x7a, 0xd5, 0x25, 0xe4, 0x19, 0x0e, 0x79, 0x1a, 0x4d, 0x36, 0x02, 0x59, + 0x5c, 0x4c, 0x59, 0x51, 0x84, 0xbd, 0xdb, 0x03, 0xaa, 0xd6, 0xc8, 0x8a, 0xaf, 0xad, 0xd1, 0xb1, + 0xfa, 0x94, 0x25, 0xc8, 0x7f, 0x35, 0x58, 0x11, 0xcc, 0x98, 0x7f, 0x6e, 0x1f, 0x03, 0x78, 0x68, + 0xde, 0xa6, 0x46, 0x56, 0xa3, 0x7a, 0xc9, 0x30, 0x8e, 0xa6, 0xaa, 0x81, 0xa8, 0x70, 0x81, 0x89, + 0x4e, 0x37, 0x66, 0x24, 0x23, 0x58, 0xe4, 0x11, 0x9c, 0x43, 0x67, 0xca, 0x47, 0x10, 0x38, 0x82, + 0x12, 0x6d, 0x22, 0xd0, 0x67, 0xbc, 0x63, 0xc8, 0x42, 0xfa, 0x1e, 0xc0, 0x68, 0x85, 0x90, 0x96, + 0x1d, 0x8a, 0x1a, 0x80, 0xe7, 0x8f, 0xfc, 0x55, 0xeb, 0xbd, 0xf2, 0x74, 0x8c, 0x93, 0x3c, 0xaa, + 0xf3, 0xe8, 0xec, 0x9f, 0x88, 0x8a, 0x38, 0xf4, 0x41, 0x08, 0xcc, 0x2d, 0x3d, 0x7a, 0x12, 0x03, + 0x8f, 0x9f, 0xc4, 0xc0, 0xcf, 0x4f, 0x62, 0xe0, 0xf5, 0xa7, 0xb1, 0x96, 0xc7, 0x4f, 0x63, 0x2d, + 0x3f, 0x3c, 0x8d, 0xb5, 0xbc, 0x78, 0x2a, 0x30, 0x84, 0xca, 0x6d, 0xc6, 0x33, 0xda, 0xaa, 0xed, + 0xed, 0x79, 0x67, 0x62, 0x2a, 0xb1, 0x2d, 0x76, 0xe6, 0x23, 0xe9, 0x6a, 0x07, 0xbf, 0x42, 0x4f, + 0xfd, 0x11, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x7f, 0xad, 0xe2, 0xaf, 0x1b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1635,6 +1643,7 @@ const _ = grpc.SupportPackageIsVersion4 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type QueryClient interface { Pools(ctx context.Context, in *QueryPoolsRequest, opts ...grpc.CallOption) (*QueryPoolsResponse, error) + // Deprecated: please use the alternative in x/swaprouter NumPools(ctx context.Context, in *QueryNumPoolsRequest, opts ...grpc.CallOption) (*QueryNumPoolsResponse, error) TotalLiquidity(ctx context.Context, in *QueryTotalLiquidityRequest, opts ...grpc.CallOption) (*QueryTotalLiquidityResponse, error) // PoolsWithFilter allows you to query specific pools with requested @@ -1657,8 +1666,9 @@ type QueryClient interface { // SpotPrice defines a gRPC query handler that returns the spot price given // a base denomination and a quote denomination. SpotPrice(ctx context.Context, in *QuerySpotPriceRequest, opts ...grpc.CallOption) (*QuerySpotPriceResponse, error) - // Estimate the swap. + // Deprecated: please use the alternative in x/swaprouter EstimateSwapExactAmountIn(ctx context.Context, in *QuerySwapExactAmountInRequest, opts ...grpc.CallOption) (*QuerySwapExactAmountInResponse, error) + // Deprecated: please use the alternative in x/swaprouter EstimateSwapExactAmountOut(ctx context.Context, in *QuerySwapExactAmountOutRequest, opts ...grpc.CallOption) (*QuerySwapExactAmountOutResponse, error) } @@ -1679,6 +1689,7 @@ func (c *queryClient) Pools(ctx context.Context, in *QueryPoolsRequest, opts ... return out, nil } +// Deprecated: Do not use. func (c *queryClient) NumPools(ctx context.Context, in *QueryNumPoolsRequest, opts ...grpc.CallOption) (*QueryNumPoolsResponse, error) { out := new(QueryNumPoolsResponse) err := c.cc.Invoke(ctx, "/osmosis.gamm.v1beta1.Query/NumPools", in, out, opts...) @@ -1788,6 +1799,7 @@ func (c *queryClient) SpotPrice(ctx context.Context, in *QuerySpotPriceRequest, return out, nil } +// Deprecated: Do not use. func (c *queryClient) EstimateSwapExactAmountIn(ctx context.Context, in *QuerySwapExactAmountInRequest, opts ...grpc.CallOption) (*QuerySwapExactAmountInResponse, error) { out := new(QuerySwapExactAmountInResponse) err := c.cc.Invoke(ctx, "/osmosis.gamm.v1beta1.Query/EstimateSwapExactAmountIn", in, out, opts...) @@ -1797,6 +1809,7 @@ func (c *queryClient) EstimateSwapExactAmountIn(ctx context.Context, in *QuerySw return out, nil } +// Deprecated: Do not use. func (c *queryClient) EstimateSwapExactAmountOut(ctx context.Context, in *QuerySwapExactAmountOutRequest, opts ...grpc.CallOption) (*QuerySwapExactAmountOutResponse, error) { out := new(QuerySwapExactAmountOutResponse) err := c.cc.Invoke(ctx, "/osmosis.gamm.v1beta1.Query/EstimateSwapExactAmountOut", in, out, opts...) @@ -1809,6 +1822,7 @@ func (c *queryClient) EstimateSwapExactAmountOut(ctx context.Context, in *QueryS // QueryServer is the server API for Query service. type QueryServer interface { Pools(context.Context, *QueryPoolsRequest) (*QueryPoolsResponse, error) + // Deprecated: please use the alternative in x/swaprouter NumPools(context.Context, *QueryNumPoolsRequest) (*QueryNumPoolsResponse, error) TotalLiquidity(context.Context, *QueryTotalLiquidityRequest) (*QueryTotalLiquidityResponse, error) // PoolsWithFilter allows you to query specific pools with requested @@ -1831,8 +1845,9 @@ type QueryServer interface { // SpotPrice defines a gRPC query handler that returns the spot price given // a base denomination and a quote denomination. SpotPrice(context.Context, *QuerySpotPriceRequest) (*QuerySpotPriceResponse, error) - // Estimate the swap. + // Deprecated: please use the alternative in x/swaprouter EstimateSwapExactAmountIn(context.Context, *QuerySwapExactAmountInRequest) (*QuerySwapExactAmountInResponse, error) + // Deprecated: please use the alternative in x/swaprouter EstimateSwapExactAmountOut(context.Context, *QuerySwapExactAmountOutRequest) (*QuerySwapExactAmountOutResponse, error) }