From 40e5320f955694083d99aaebc0c801fabf4a73aa Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 2 Jan 2023 10:48:12 -0800 Subject: [PATCH] Fix: Support HTTP requests for `FilteredPools` (#3737) (#3901) * Fix: Support GRPC For coins struct * Add changelog entry * use parse coin normalized * Nicolas' review :) (cherry picked from commit 010d4cf683b4ae7d1bb847b3c6a1d1094cfa9445) Co-authored-by: Matt, Park <45252226+mattverse@users.noreply.github.com> --- CHANGELOG.md | 2 + proto/osmosis/gamm/v1beta1/query.proto | 8 +- x/gamm/client/cli/query.go | 20 +- x/gamm/keeper/grpc_query.go | 8 +- x/gamm/keeper/grpc_query_test.go | 54 +++-- x/gamm/types/query.pb.go | 278 ++++++++++++------------- 6 files changed, 183 insertions(+), 187 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b607a6b4353..02d07de0017 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -181,6 +181,8 @@ which acts as a fuzz testing tool tailored for the SDK state machine. * [#2473](https://github.com/osmosis-labs/osmosis/pull/2473) x/superfluid `AddNewSuperfluidAsset` now returns error, if any occurs instead of ignoring it. * [#2714](https://github.com/osmosis-labs/osmosis/pull/2714) Upgrade wasmd to v0.28.0. * Remove x/Bech32IBC +* [#3737](https://github.com/osmosis-labs/osmosis/pull/3737) Change FilteredPools MinLiquidity field from sdk.Coins struct to string. + #### Golang API breaks diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index 9d6a521c097..fbf976691ae 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -233,11 +233,9 @@ message QuerySpotPriceRequest { //=============================== PoolsWithFilter message QueryPoolsWithFilterRequest { - repeated cosmos.base.v1beta1.Coin min_liquidity = 1 [ - (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"min_liquidity\"", - (gogoproto.nullable) = false - ]; + // String of the coins in single string seperated by comma. Ex) + // 10uatom,100uosmo + string min_liquidity = 1 [ (gogoproto.moretags) = "yaml:\"min_liquidity\"" ]; string pool_type = 2; cosmos.base.query.v1beta1.PageRequest pagination = 3; } diff --git a/x/gamm/client/cli/query.go b/x/gamm/client/cli/query.go index b0d32a693fa..c83ae9534ba 100644 --- a/x/gamm/client/cli/query.go +++ b/x/gamm/client/cli/query.go @@ -7,12 +7,9 @@ import ( "strings" "github.com/gogo/protobuf/proto" - "google.golang.org/grpc/codes" - "google.golang.org/grpc/status" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/version" "github.com/spf13/cobra" flag "github.com/spf13/pflag" @@ -286,24 +283,11 @@ $ %s query gamm pools-with-filter } queryClient := types.NewQueryClient(clientCtx) - var min_liquidity sdk.Coins var pool_type string - if len(args) == 1 { - coins, err := sdk.ParseCoinsNormalized(args[0]) - if err != nil { - pool_type = args[0] - } - min_liquidity = coins - } else { - coins, err := sdk.ParseCoinsNormalized(args[0]) - if err != nil { - return status.Errorf(codes.InvalidArgument, "invalid token: %s", err.Error()) - } - - min_liquidity = coins + min_liquidity := args[0] + if len(args) > 1 { pool_type = args[1] } - res, err := queryClient.PoolsWithFilter(cmd.Context(), &types.QueryPoolsWithFilterRequest{ MinLiquidity: min_liquidity, PoolType: pool_type, diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 159fc948d7d..abaaf48b3b9 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -161,6 +161,10 @@ func (q Querier) PoolsWithFilter(ctx context.Context, req *types.QueryPoolsWithF sdkCtx := sdk.UnwrapSDKContext(ctx) store := sdkCtx.KVStore(q.Keeper.storeKey) poolStore := prefix.NewStore(store, types.KeyPrefixPools) + minLiquidity, err := sdk.ParseCoinsNormalized(req.MinLiquidity) + if err != nil { + return nil, err + } var response = []*codectypes.Any{} pageRes, err := query.FilteredPaginate(poolStore, req.Pagination, func(_, value []byte, accumulate bool) (bool, error) { @@ -172,10 +176,10 @@ func (q Querier) PoolsWithFilter(ctx context.Context, req *types.QueryPoolsWithF poolId := pool.GetId() // if liquidity specified in request - if len(req.MinLiquidity) > 0 { + if len(minLiquidity) > 0 { poolLiquidity := pool.GetTotalPoolLiquidity(sdkCtx) - if !poolLiquidity.IsAllGTE(req.MinLiquidity) { + if !poolLiquidity.IsAllGTE(minLiquidity) { return false, nil } } diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index 83c223fee08..0d9ad95809c 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -186,16 +186,16 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { name string num_pools int expected_num_pools_response int - min_liquidity sdk.Coins + min_liquidity string pool_type string poolAssets []balancertypes.PoolAsset - expectedErr error + expectedErr bool }{ { name: "valid tc with both filters for min liquidity and pool type", num_pools: 1, expected_num_pools_response: 1, - min_liquidity: sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(50000)), sdk.NewCoin("bar", sdk.NewInt(50000))), + min_liquidity: "50000foo, 50000bar", pool_type: "Balancer", poolAssets: []balancertypes.PoolAsset{ { @@ -207,13 +207,13 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "only min liquidity specified (too high for pools - return 0 pools)", num_pools: 1, expected_num_pools_response: 0, - min_liquidity: sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(500000000)), sdk.NewCoin("bar", sdk.NewInt(500000000))), + min_liquidity: "500000000foo, 500000000bar", poolAssets: []balancertypes.PoolAsset{ { Weight: sdk.NewInt(100), @@ -224,13 +224,13 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "wrong pool type specified", num_pools: 1, expected_num_pools_response: 0, - min_liquidity: nil, + min_liquidity: "", pool_type: "balaswap", poolAssets: []balancertypes.PoolAsset{ { @@ -242,13 +242,13 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "2 parameters specified + single-token min liquidity", num_pools: 1, expected_num_pools_response: 4, - min_liquidity: sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(500))), + min_liquidity: "500foo", pool_type: "Balancer", poolAssets: []balancertypes.PoolAsset{ { @@ -260,13 +260,13 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "min_liquidity denom not present in pool", num_pools: 1, expected_num_pools_response: 0, - min_liquidity: sdk.NewCoins(sdk.NewCoin("whoami", sdk.NewInt(500))), + min_liquidity: "500whoami", poolAssets: []balancertypes.PoolAsset{ { Weight: sdk.NewInt(100), @@ -277,13 +277,13 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "only min liquidity specified - valid", num_pools: 1, expected_num_pools_response: 6, - min_liquidity: sdk.NewCoins(sdk.NewCoin("foo", sdk.ZeroInt()), sdk.NewCoin("bar", sdk.ZeroInt())), + min_liquidity: "0foo,0bar", poolAssets: []balancertypes.PoolAsset{ { Weight: sdk.NewInt(100), @@ -294,7 +294,7 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, }, { name: "only valid pool type specified", @@ -311,7 +311,25 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), }, }, - expectedErr: nil, + expectedErr: false, + }, + { + name: "invalid min liquidity specified", + num_pools: 1, + expected_num_pools_response: 1, + min_liquidity: "wrong300foo", + pool_type: "Balancer", + poolAssets: []balancertypes.PoolAsset{ + { + Weight: sdk.NewInt(100), + Token: sdk.NewCoin("foo", sdk.NewInt(5000000)), + }, + { + Weight: sdk.NewInt(200), + Token: sdk.NewCoin("bar", sdk.NewInt(5000000)), + }, + }, + expectedErr: true, }, } for _, tc := range testCases { @@ -327,11 +345,11 @@ func (suite *KeeperTestSuite) TestPoolsWithFilter() { MinLiquidity: tc.min_liquidity, PoolType: tc.pool_type, }) - if tc.expectedErr == nil { + if tc.expectedErr { + suite.Require().Error(err) + } else { suite.Require().NoError(err) suite.Require().Equal(tc.expected_num_pools_response, len(res.Pools)) - } else { - suite.Require().ErrorIs(err, tc.expectedErr) } }) } diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index 0cadd1e2c48..d936a347bf0 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -1014,9 +1014,11 @@ func (m *QuerySpotPriceRequest) GetQuoteAssetDenom() string { } type QueryPoolsWithFilterRequest struct { - MinLiquidity github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=min_liquidity,json=minLiquidity,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"min_liquidity" yaml:"min_liquidity"` - PoolType string `protobuf:"bytes,2,opt,name=pool_type,json=poolType,proto3" json:"pool_type,omitempty"` - Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` + // String of the coins in single string seperated by comma. Ex) + // 10uatom,100uosmo + MinLiquidity string `protobuf:"bytes,1,opt,name=min_liquidity,json=minLiquidity,proto3" json:"min_liquidity,omitempty" yaml:"min_liquidity"` + PoolType string `protobuf:"bytes,2,opt,name=pool_type,json=poolType,proto3" json:"pool_type,omitempty"` + Pagination *query.PageRequest `protobuf:"bytes,3,opt,name=pagination,proto3" json:"pagination,omitempty"` } func (m *QueryPoolsWithFilterRequest) Reset() { *m = QueryPoolsWithFilterRequest{} } @@ -1052,11 +1054,11 @@ func (m *QueryPoolsWithFilterRequest) XXX_DiscardUnknown() { var xxx_messageInfo_QueryPoolsWithFilterRequest proto.InternalMessageInfo -func (m *QueryPoolsWithFilterRequest) GetMinLiquidity() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *QueryPoolsWithFilterRequest) GetMinLiquidity() string { if m != nil { return m.MinLiquidity } - return nil + return "" } func (m *QueryPoolsWithFilterRequest) GetPoolType() string { @@ -1505,120 +1507,119 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) } var fileDescriptor_d9a717df9ca609ef = []byte{ - // 1795 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x6c, 0x1c, 0x49, - 0x19, 0x76, 0x8d, 0x1f, 0xeb, 0x29, 0xaf, 0x5f, 0xb5, 0x4e, 0x32, 0x19, 0x3b, 0x33, 0xa1, 0xd8, - 0xb5, 0xbd, 0x1b, 0xbb, 0x27, 0x7e, 0xac, 0x40, 0x86, 0xdd, 0xac, 0x9d, 0xb5, 0xe3, 0xb1, 0xd8, - 0xb5, 0xe9, 0x44, 0x89, 0x80, 0xc3, 0xa8, 0x6d, 0x77, 0xc6, 0x9d, 0xcc, 0x74, 0xb5, 0xa7, 0xab, - 0x63, 0x5b, 0x28, 0x8a, 0x14, 0x21, 0x94, 0x03, 0x48, 0x48, 0x21, 0x39, 0x20, 0x04, 0x1c, 0x10, - 0x42, 0x39, 0x23, 0x71, 0xe2, 0x84, 0x90, 0x22, 0x24, 0xa4, 0x20, 0x2e, 0x88, 0xc3, 0x80, 0x12, - 0xb8, 0x71, 0xf2, 0x85, 0x23, 0xa8, 0xaa, 0xfe, 0x7e, 0xcc, 0xfb, 0x01, 0x91, 0xc2, 0xc9, 0x9e, - 0xfa, 0x1f, 0xf5, 0xfd, 0xdf, 0xff, 0xd7, 0xdf, 0x7f, 0x15, 0xbe, 0xc8, 0xdc, 0x22, 0x73, 0x2d, - 0x37, 0x93, 0x37, 0x8a, 0xc5, 0xcc, 0xbd, 0x85, 0x5d, 0x93, 0x1b, 0x0b, 0x99, 0x43, 0xcf, 0x2c, - 0x9d, 0x68, 0x4e, 0x89, 0x71, 0x46, 0x26, 0x40, 0x43, 0x13, 0x1a, 0x1a, 0x68, 0x24, 0x27, 0xf2, - 0x2c, 0xcf, 0xa4, 0x42, 0x46, 0xfc, 0xa7, 0x74, 0x93, 0x17, 0xea, 0x7a, 0xe3, 0xc7, 0x20, 0x4e, - 0xed, 0x49, 0x79, 0x66, 0xd7, 0x70, 0xcd, 0x40, 0xba, 0xc7, 0x2c, 0x1b, 0xe4, 0x1f, 0x44, 0xe5, - 0x12, 0x43, 0xa0, 0xe5, 0x18, 0x79, 0xcb, 0x36, 0xb8, 0xc5, 0x7c, 0xdd, 0xa9, 0x3c, 0x63, 0xf9, - 0x82, 0x99, 0x31, 0x1c, 0x2b, 0x63, 0xd8, 0x36, 0xe3, 0x52, 0xe8, 0x82, 0xf4, 0x3c, 0x48, 0xe5, - 0xaf, 0x5d, 0xef, 0x76, 0xc6, 0xb0, 0x4f, 0x7c, 0x91, 0xda, 0x24, 0xa7, 0xc0, 0xab, 0x1f, 0x4a, - 0x44, 0xaf, 0xe0, 0xb1, 0xaf, 0x8b, 0x5d, 0x77, 0x18, 0x2b, 0xe8, 0xe6, 0xa1, 0x67, 0xba, 0x9c, - 0x5c, 0xc2, 0x6f, 0x39, 0x8c, 0x15, 0x72, 0xd6, 0x7e, 0x02, 0x5d, 0x44, 0xb3, 0x7d, 0x6b, 0xe4, - 0xb4, 0x9c, 0x1e, 0x39, 0x31, 0x8a, 0x85, 0x15, 0x0a, 0x02, 0xaa, 0x0f, 0x88, 0xff, 0xb2, 0xfb, - 0x74, 0x13, 0x8f, 0x47, 0x1c, 0xb8, 0x0e, 0xb3, 0x5d, 0x93, 0x2c, 0xe1, 0x3e, 0x21, 0x96, 0xe6, - 0x43, 0x8b, 0x13, 0x9a, 0x82, 0xa6, 0xf9, 0xd0, 0xb4, 0x55, 0xfb, 0x64, 0x2d, 0xfe, 0xfb, 0x5f, - 0xcd, 0xf7, 0x0b, 0xab, 0xac, 0x2e, 0x95, 0xe9, 0xb7, 0x22, 0x9e, 0x5c, 0x1f, 0xcb, 0x06, 0xc6, - 0x21, 0x0f, 0x89, 0x98, 0xf4, 0x37, 0xad, 0x41, 0x08, 0x82, 0x34, 0x4d, 0x25, 0x0e, 0x48, 0xd3, - 0x76, 0x8c, 0xbc, 0x09, 0xb6, 0x7a, 0xc4, 0x92, 0xfe, 0x10, 0x61, 0x12, 0xf5, 0x0e, 0x40, 0x3f, - 0xc4, 0xfd, 0x62, 0x6f, 0x37, 0x81, 0x2e, 0xf6, 0xb6, 0x83, 0x54, 0x69, 0x93, 0x6b, 0x75, 0x50, - 0xcd, 0xb4, 0x44, 0xa5, 0xf6, 0xac, 0x80, 0x75, 0x16, 0x4f, 0x48, 0x54, 0x9f, 0x7b, 0xc5, 0x68, - 0xd8, 0x74, 0x0b, 0x9f, 0xa9, 0x5a, 0x07, 0xc0, 0x0b, 0x38, 0x6e, 0x7b, 0xc5, 0x9c, 0x0f, 0x5a, - 0x64, 0x67, 0xe2, 0xb4, 0x9c, 0x1e, 0x53, 0xd9, 0x09, 0x44, 0x54, 0x1f, 0xb4, 0xc1, 0x94, 0x5e, - 0x85, 0x3d, 0xc4, 0xaf, 0x1b, 0x27, 0x8e, 0xd9, 0x55, 0x9a, 0x7d, 0x40, 0xa1, 0x93, 0x10, 0x90, - 0x54, 0xe6, 0x27, 0x8e, 0x29, 0xfd, 0xc4, 0xa3, 0x80, 0x02, 0x11, 0xd5, 0x07, 0x1d, 0x30, 0xa5, - 0xbf, 0x46, 0x38, 0x25, 0x9d, 0x5d, 0x35, 0x0a, 0x7b, 0x5b, 0xcc, 0xb2, 0x85, 0xd3, 0xeb, 0x07, - 0x46, 0xc9, 0x74, 0xbb, 0xc1, 0x46, 0x0e, 0x70, 0x9c, 0xb3, 0xbb, 0xa6, 0xed, 0xe6, 0x2c, 0x91, - 0x0c, 0x91, 0xc8, 0xf3, 0x15, 0xc9, 0xf0, 0xd3, 0x70, 0x95, 0x59, 0xf6, 0xda, 0xe5, 0xe7, 0xe5, - 0x74, 0xcf, 0xb3, 0xbf, 0xa6, 0x67, 0xf3, 0x16, 0x3f, 0xf0, 0x76, 0xb5, 0x3d, 0x56, 0x84, 0x23, - 0x01, 0x7f, 0xe6, 0xdd, 0xfd, 0xbb, 0x19, 0x81, 0xd9, 0x95, 0x06, 0xae, 0x3e, 0xa8, 0xbc, 0x67, - 0x6d, 0xfa, 0x30, 0x86, 0xd3, 0x0d, 0x91, 0x03, 0x21, 0x2e, 0x1e, 0x73, 0xc5, 0x4a, 0x8e, 0x79, - 0x3c, 0x67, 0x14, 0x99, 0x67, 0x73, 0xe0, 0x25, 0x2b, 0x76, 0xfe, 0x4b, 0x39, 0x3d, 0xdd, 0xc6, - 0xce, 0x59, 0x9b, 0x9f, 0x96, 0xd3, 0xe7, 0x54, 0xc4, 0xd5, 0xfe, 0xa8, 0x3e, 0x22, 0x97, 0xb6, - 0x3d, 0xbe, 0x2a, 0x17, 0xc8, 0x1d, 0x8c, 0x81, 0x02, 0xe6, 0xf1, 0xd7, 0xc1, 0x01, 0x30, 0xbc, - 0xed, 0x71, 0xfa, 0x23, 0x84, 0x67, 0x02, 0x12, 0xd6, 0x8f, 0x2d, 0x2e, 0x48, 0x90, 0x5a, 0x1b, - 0x25, 0x56, 0xac, 0xcc, 0xe3, 0xb9, 0xaa, 0x3c, 0x06, 0x39, 0xbb, 0x89, 0x47, 0x55, 0x54, 0x96, - 0xed, 0x93, 0x14, 0x93, 0x24, 0x69, 0x9d, 0x91, 0xa4, 0x0f, 0x4b, 0x37, 0x59, 0x5b, 0x11, 0x41, - 0x9f, 0x22, 0x3c, 0xdb, 0x1a, 0x1c, 0xa4, 0xaa, 0x92, 0x35, 0xf4, 0x5a, 0x59, 0x5b, 0xc7, 0x67, - 0x83, 0x03, 0xb4, 0x63, 0x94, 0x8c, 0x62, 0x57, 0xb5, 0x4e, 0xaf, 0xe1, 0x73, 0x35, 0x6e, 0x20, - 0x9a, 0x39, 0x3c, 0xe0, 0xc8, 0x95, 0x66, 0x6d, 0x57, 0x07, 0x1d, 0xfa, 0x19, 0x9c, 0xc1, 0x1b, - 0x8c, 0x1b, 0x05, 0xe1, 0xed, 0x6b, 0xd6, 0xa1, 0x67, 0xed, 0x5b, 0xfc, 0xa4, 0x2b, 0x5c, 0x3f, - 0x43, 0x70, 0x32, 0xea, 0xf9, 0x03, 0x80, 0xf7, 0x71, 0xbc, 0xe0, 0x2f, 0xb6, 0x66, 0xfb, 0x53, - 0xc1, 0x76, 0xd8, 0x49, 0x02, 0x4b, 0xda, 0x59, 0x06, 0x42, 0xbb, 0x0d, 0xa0, 0x4e, 0x22, 0xec, - 0xbe, 0xdd, 0x50, 0x0f, 0x27, 0x6a, 0xfd, 0x40, 0x88, 0xdf, 0xc0, 0x6f, 0x73, 0xb1, 0x9c, 0x93, - 0x55, 0xe9, 0x67, 0xa2, 0x49, 0x94, 0x93, 0x10, 0xe5, 0x3b, 0x6a, 0xb3, 0xa8, 0x31, 0xd5, 0x87, - 0x78, 0xb8, 0x05, 0xfd, 0x0d, 0xc2, 0xef, 0xd6, 0xf4, 0x9e, 0xcf, 0xd9, 0xf5, 0x23, 0xc3, 0xf9, - 0xbf, 0xe8, 0x9d, 0xff, 0x42, 0xf8, 0xbd, 0x16, 0xf8, 0x81, 0xc4, 0x07, 0x9d, 0x1d, 0xcb, 0x75, - 0xa0, 0x70, 0xdc, 0xa7, 0xd0, 0x37, 0xa5, 0x5d, 0x9e, 0x55, 0xf2, 0x19, 0xc6, 0x2a, 0x05, 0xd0, - 0x4d, 0xbb, 0xe9, 0x4b, 0x71, 0xe5, 0x41, 0x1c, 0xfd, 0x7f, 0x22, 0xf8, 0x78, 0x5e, 0x77, 0x18, - 0xdf, 0x29, 0x59, 0x7b, 0x5d, 0x7d, 0x82, 0xc9, 0x3a, 0x1e, 0x13, 0xc1, 0xe7, 0x0c, 0xd7, 0x35, - 0x79, 0x6e, 0xdf, 0xb4, 0x59, 0x11, 0xb0, 0x4d, 0x86, 0x9f, 0x8a, 0x6a, 0x0d, 0xaa, 0x8f, 0x88, - 0xa5, 0x55, 0xb1, 0xf2, 0xa9, 0x58, 0x20, 0x9b, 0x78, 0xfc, 0xd0, 0x63, 0xbc, 0xd2, 0x4f, 0xaf, - 0xf4, 0x33, 0x75, 0x5a, 0x4e, 0x27, 0x94, 0x9f, 0x1a, 0x15, 0xaa, 0x8f, 0xca, 0xb5, 0xd0, 0xd3, - 0x4a, 0x2c, 0x81, 0xb6, 0xfa, 0x06, 0xfb, 0xc6, 0xfa, 0xf5, 0xa1, 0x23, 0x8b, 0x1f, 0x88, 0x4c, - 0x6e, 0x98, 0x26, 0xfd, 0x7e, 0x0c, 0x4f, 0x86, 0xa3, 0xd6, 0x2d, 0x8b, 0x1f, 0x6c, 0x58, 0x05, - 0x6e, 0x96, 0xfc, 0xa0, 0x1f, 0x21, 0x3c, 0x5c, 0xb4, 0xec, 0x5c, 0x07, 0xbd, 0x60, 0x13, 0x52, - 0x3c, 0xa1, 0xc0, 0x55, 0x58, 0x77, 0x96, 0xe5, 0xb7, 0x8b, 0x96, 0x1d, 0x74, 0x26, 0x32, 0x19, - 0x1d, 0x5e, 0x24, 0x97, 0xe1, 0x98, 0x52, 0x35, 0x7a, 0xf6, 0x76, 0x3d, 0x7a, 0xfe, 0x04, 0xe1, - 0xa9, 0xfa, 0x7c, 0xbc, 0x21, 0x43, 0xa8, 0x0e, 0x9f, 0xa6, 0x48, 0x79, 0x02, 0xb2, 0x65, 0x8c, - 0x5d, 0x87, 0xf1, 0x9c, 0x23, 0x56, 0x61, 0x8a, 0x39, 0x13, 0x1e, 0xb5, 0x50, 0x46, 0xf5, 0xb8, - 0xeb, 0x5b, 0x8b, 0xba, 0xa0, 0xff, 0x46, 0xf8, 0x82, 0x72, 0x7a, 0x64, 0x38, 0xeb, 0xc7, 0xc6, - 0x1e, 0x4c, 0x2a, 0x59, 0xdb, 0x2f, 0x83, 0xf7, 0xf1, 0x80, 0x6b, 0xda, 0xfb, 0x66, 0x09, 0xfc, - 0x8e, 0x9f, 0x96, 0xd3, 0xc3, 0xe0, 0x57, 0xae, 0x53, 0x1d, 0x14, 0xa2, 0xc7, 0x24, 0xd6, 0xf2, - 0x98, 0x68, 0x58, 0xf5, 0x1c, 0xd1, 0xd0, 0x54, 0x59, 0xbf, 0x73, 0x5a, 0x4e, 0x8f, 0x46, 0x9a, - 0x43, 0xce, 0xb2, 0xa9, 0xfe, 0x96, 0xfc, 0x37, 0x6b, 0x93, 0x9b, 0x78, 0xa0, 0xc4, 0x3c, 0x6e, - 0xba, 0x89, 0x3e, 0x49, 0xff, 0x8c, 0x56, 0xef, 0xf6, 0xa7, 0x89, 0x38, 0x82, 0x10, 0x84, 0xfe, - 0xda, 0x19, 0x28, 0x4a, 0x00, 0xad, 0x9c, 0x50, 0x1d, 0xbc, 0xd1, 0x27, 0xfe, 0x94, 0x5b, 0x87, - 0x81, 0x70, 0x54, 0x54, 0x80, 0xfe, 0x77, 0xa3, 0x62, 0xb5, 0x3f, 0xaa, 0x8f, 0xc8, 0xa5, 0x60, - 0x54, 0xa4, 0xdf, 0x89, 0xd5, 0xc7, 0xb5, 0xed, 0xf1, 0xd7, 0x9d, 0x9a, 0x5b, 0x01, 0xd5, 0xbd, - 0x92, 0xea, 0xd9, 0x56, 0x54, 0x0b, 0x4c, 0x6d, 0x70, 0x2d, 0x2e, 0x21, 0x41, 0xe0, 0x89, 0xbe, - 0xea, 0x4b, 0x48, 0x20, 0xa2, 0xf0, 0x39, 0x12, 0x4d, 0xf9, 0xb1, 0x3f, 0xb0, 0xd4, 0xa3, 0x01, - 0xf2, 0xe3, 0xe0, 0x51, 0xbf, 0x60, 0x2a, 0xd3, 0xb3, 0xd9, 0x71, 0x7a, 0xce, 0x56, 0xd6, 0x5f, - 0x90, 0x9d, 0x61, 0x28, 0x43, 0x48, 0xce, 0x14, 0x4e, 0x86, 0xb3, 0x45, 0xf5, 0x44, 0x46, 0x7f, - 0x8c, 0xa0, 0xb3, 0x56, 0x8b, 0xdf, 0x88, 0x01, 0x6b, 0xf1, 0xd9, 0x04, 0xee, 0x97, 0xf0, 0xc8, - 0x03, 0x2c, 0x5b, 0x95, 0x4b, 0x1a, 0x1c, 0xa6, 0x9a, 0x7b, 0x7e, 0x72, 0xb6, 0xb5, 0xa2, 0x0a, - 0x92, 0x7e, 0xf1, 0xe1, 0x9f, 0xfe, 0xfe, 0x38, 0x76, 0x81, 0x4c, 0x66, 0xea, 0xbe, 0xbc, 0xa8, - 0xde, 0xf8, 0x3d, 0x84, 0x07, 0xfd, 0xbb, 0x33, 0xf9, 0xa0, 0x89, 0xef, 0xaa, 0x8b, 0x77, 0xf2, - 0x52, 0x5b, 0xba, 0x00, 0x65, 0x46, 0x42, 0xf9, 0x02, 0x49, 0xd7, 0x87, 0x12, 0xdc, 0xc6, 0xc9, - 0xcf, 0x11, 0x1e, 0xa9, 0xcc, 0x19, 0xb9, 0xdc, 0x64, 0xa3, 0xba, 0xd9, 0x4f, 0x2e, 0x74, 0x60, - 0x01, 0x00, 0xe7, 0x25, 0xc0, 0x19, 0xf2, 0x5e, 0x7d, 0x80, 0x6a, 0xda, 0x0c, 0x12, 0x48, 0x7e, - 0x81, 0xf0, 0x68, 0xd5, 0x47, 0x8a, 0x2c, 0xb4, 0x4a, 0x4c, 0xcd, 0x07, 0x3e, 0xb9, 0xd8, 0x89, - 0x09, 0x20, 0x9d, 0x93, 0x48, 0xa7, 0xc9, 0xbb, 0xf5, 0x91, 0xde, 0x96, 0xda, 0xe6, 0x3e, 0xf0, - 0xf9, 0x5d, 0x84, 0xfb, 0x84, 0x27, 0x32, 0xdd, 0x62, 0x2b, 0x1f, 0xd2, 0x4c, 0x4b, 0xbd, 0xf6, - 0x18, 0x93, 0xdb, 0x67, 0xbe, 0x0d, 0x9d, 0xed, 0x3e, 0x79, 0x8a, 0xf0, 0xa0, 0xff, 0x24, 0xd2, - 0xb4, 0xce, 0xaa, 0x1e, 0x5f, 0x9a, 0xd6, 0x59, 0xf5, 0x1b, 0x0b, 0x5d, 0x90, 0xa0, 0x2e, 0x91, - 0xf7, 0x1b, 0x83, 0x92, 0x23, 0x4c, 0x04, 0xd8, 0x13, 0x84, 0x13, 0x8d, 0x06, 0x6d, 0xb2, 0xd2, - 0x64, 0xf3, 0x16, 0xb7, 0x8b, 0xe4, 0x57, 0xba, 0xb2, 0x85, 0x40, 0x7a, 0xc8, 0x6f, 0x11, 0x26, - 0xb5, 0x8f, 0x27, 0x64, 0xb9, 0x4d, 0xaf, 0x95, 0x58, 0x3e, 0xec, 0xd0, 0x0a, 0x50, 0x7c, 0x22, - 0xe9, 0x5c, 0x21, 0x5f, 0x6e, 0x2b, 0xc7, 0x99, 0x3b, 0xcc, 0xb2, 0x73, 0xee, 0x91, 0xe1, 0xe4, - 0x4c, 0xf1, 0x99, 0xc8, 0x59, 0x36, 0xf9, 0x07, 0xc2, 0x93, 0x4d, 0x1e, 0x18, 0xc8, 0x47, 0x2d, - 0x80, 0x35, 0x7f, 0x35, 0x49, 0x7e, 0xdc, 0xad, 0x39, 0x04, 0x78, 0x4d, 0x06, 0xb8, 0x4a, 0xae, - 0xb4, 0x17, 0xa0, 0x79, 0x6c, 0x71, 0x15, 0xa0, 0x7a, 0x92, 0x51, 0xdf, 0x26, 0x11, 0xe7, 0x4f, - 0x11, 0xc6, 0xe1, 0x4b, 0x03, 0x99, 0x6b, 0x51, 0xb4, 0x15, 0xef, 0x1a, 0xc9, 0xf9, 0x36, 0xb5, - 0x01, 0xf4, 0xb2, 0x04, 0xad, 0x91, 0xb9, 0xf6, 0x40, 0xab, 0x67, 0x0c, 0xf2, 0x3b, 0x84, 0x49, - 0xed, 0x93, 0x43, 0xd3, 0x7a, 0x6a, 0xf8, 0xe2, 0xd1, 0xb4, 0x9e, 0x1a, 0xbf, 0x6b, 0xd0, 0x35, - 0x89, 0xfc, 0xab, 0x64, 0xa5, 0x3d, 0xe4, 0xaa, 0xeb, 0xca, 0x9f, 0x61, 0xeb, 0xfd, 0x25, 0xc2, - 0x43, 0x91, 0x07, 0x05, 0x32, 0xdf, 0x0a, 0x4a, 0x65, 0xc5, 0x68, 0xed, 0xaa, 0x03, 0xe4, 0x15, - 0x09, 0x79, 0x99, 0x2c, 0x76, 0x02, 0x59, 0xdd, 0x68, 0x45, 0x51, 0xc4, 0x83, 0xab, 0x02, 0x69, - 0xd6, 0xc8, 0xaa, 0xef, 0xbb, 0xc9, 0xb9, 0xf6, 0x94, 0x01, 0xe4, 0x97, 0x3a, 0xac, 0x08, 0x61, - 0xec, 0x3e, 0x8a, 0x21, 0xf2, 0x07, 0x84, 0xcf, 0xaf, 0xbb, 0xdc, 0x2a, 0x1a, 0xdc, 0xac, 0x99, - 0xbe, 0xc9, 0x52, 0x33, 0x10, 0x0d, 0x6e, 0x2b, 0xc9, 0xe5, 0xce, 0x8c, 0x20, 0x82, 0x75, 0x19, - 0xc1, 0x15, 0xf2, 0x51, 0xfd, 0x08, 0x22, 0x47, 0x10, 0xd0, 0x66, 0x22, 0x7d, 0x26, 0x3c, 0x86, - 0x7f, 0x44, 0x38, 0xd9, 0x20, 0x9e, 0x6d, 0x8f, 0x93, 0x0e, 0xb0, 0x85, 0x43, 0x7e, 0xd3, 0x62, - 0x6f, 0x3c, 0x13, 0xd3, 0x0d, 0x19, 0xd2, 0x27, 0xe4, 0xe3, 0xff, 0x22, 0x24, 0xe6, 0xf1, 0xb5, - 0xad, 0xe7, 0x2f, 0x53, 0xe8, 0xc5, 0xcb, 0x14, 0xfa, 0xdb, 0xcb, 0x14, 0xfa, 0xc1, 0xab, 0x54, - 0xcf, 0x8b, 0x57, 0xa9, 0x9e, 0x3f, 0xbf, 0x4a, 0xf5, 0x7c, 0xf3, 0x72, 0x64, 0xf6, 0x84, 0x3d, - 0xe6, 0x0b, 0xc6, 0xae, 0x1b, 0x6c, 0x78, 0x6f, 0x61, 0x29, 0x73, 0xac, 0xb6, 0x95, 0x93, 0xe8, - 0xee, 0x80, 0xbc, 0x29, 0x2f, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xce, 0x32, 0x25, 0xda, - 0x1b, 0x00, 0x00, + // 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, } // Reference imports to suppress errors if they are not otherwise used. @@ -3008,18 +3009,11 @@ func (m *QueryPoolsWithFilterRequest) MarshalToSizedBuffer(dAtA []byte) (int, er dAtA[i] = 0x12 } if len(m.MinLiquidity) > 0 { - for iNdEx := len(m.MinLiquidity) - 1; iNdEx >= 0; iNdEx-- { - { - size, err := m.MinLiquidity[iNdEx].MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintQuery(dAtA, i, uint64(size)) - } - i-- - dAtA[i] = 0xa - } + i -= len(m.MinLiquidity) + copy(dAtA[i:], m.MinLiquidity) + i = encodeVarintQuery(dAtA, i, uint64(len(m.MinLiquidity))) + i-- + dAtA[i] = 0xa } return len(dAtA) - i, nil } @@ -3655,11 +3649,9 @@ func (m *QueryPoolsWithFilterRequest) Size() (n int) { } var l int _ = l - if len(m.MinLiquidity) > 0 { - for _, e := range m.MinLiquidity { - l = e.Size() - n += 1 + l + sovQuery(uint64(l)) - } + l = len(m.MinLiquidity) + if l > 0 { + n += 1 + l + sovQuery(uint64(l)) } l = len(m.PoolType) if l > 0 { @@ -5694,7 +5686,7 @@ func (m *QueryPoolsWithFilterRequest) Unmarshal(dAtA []byte) error { if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field MinLiquidity", wireType) } - var msglen int + var stringLen uint64 for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowQuery @@ -5704,25 +5696,23 @@ func (m *QueryPoolsWithFilterRequest) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - msglen |= int(b&0x7F) << shift + stringLen |= uint64(b&0x7F) << shift if b < 0x80 { break } } - if msglen < 0 { + intStringLen := int(stringLen) + if intStringLen < 0 { return ErrInvalidLengthQuery } - postIndex := iNdEx + msglen + postIndex := iNdEx + intStringLen if postIndex < 0 { return ErrInvalidLengthQuery } if postIndex > l { return io.ErrUnexpectedEOF } - m.MinLiquidity = append(m.MinLiquidity, types1.Coin{}) - if err := m.MinLiquidity[len(m.MinLiquidity)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } + m.MinLiquidity = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 {