diff --git a/proto/osmosis/gamm/v1beta1/query.proto b/proto/osmosis/gamm/v1beta1/query.proto index 07b404f4c21..e4b22ee7b8f 100644 --- a/proto/osmosis/gamm/v1beta1/query.proto +++ b/proto/osmosis/gamm/v1beta1/query.proto @@ -38,10 +38,10 @@ service Query { option (google.api.http).get = "/osmosis/gamm/v1beta1/pool_type/{pool_id}"; } - // Simulates joining pool without a swap. Returns the amount of shares you'd get - // and tokens needed to provide - rpc CalcJoinPoolNoSwap(QueryJoinPoolNoSwapRequest) - returns (QueryJoinPoolNoSwapResponse) {} + // Simulates joining pool without a swap. Returns the amount of shares you'd + // get and tokens needed to provide + rpc CalcJoinPoolNoSwap(QueryCalcJoinPoolNoSwapRequest) + returns (QueryCalcJoinPoolNoSwapResponse) {} rpc CalcJoinPoolShares(QueryCalcJoinPoolSharesRequest) returns (QueryCalcJoinPoolSharesResponse) { @@ -191,17 +191,18 @@ message QueryTotalSharesResponse { ]; } //=============================== SimJoinPoolNoSwap -message QueryJoinPoolNoSwapRequest { +message QueryCalcJoinPoolNoSwapRequest { uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ]; - string shares_out_amount = 2 [ - (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int", + string tokens_in = 2 [ + (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Coins", + (gogoproto.moretags) = "yaml:\"tokens_in\"", (gogoproto.nullable) = false ]; } -message QueryJoinPoolNoSwapResponse { - repeated cosmos.base.v1beta1.Coin tokens_in = 1 [ +message QueryCalcJoinPoolNoSwapResponse { + repeated cosmos.base.v1beta1.Coin tokens_out = 1 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", - (gogoproto.moretags) = "yaml:\"tokens_in\"", + (gogoproto.moretags) = "yaml:\"tokens_out\"", (gogoproto.nullable) = false ]; string shares_out = 2 [ diff --git a/x/gamm/keeper/export_test.go b/x/gamm/keeper/export_test.go index 9279bac0d5e..395f8d31e4d 100644 --- a/x/gamm/keeper/export_test.go +++ b/x/gamm/keeper/export_test.go @@ -20,6 +20,4 @@ func (k Keeper) GetNextPoolIdAndIncrement(ctx sdk.Context) uint64 { return k.getNextPoolIdAndIncrement(ctx) } -func (_ Keeper) GetMaximalNoSwapLPAmount(ctx sdk.Context, pool types.PoolI, numShares sdk.Int) (sdk.Coins, error) { - return getMaximalNoSwapLPAmount(ctx, pool, numShares) -} +// diff --git a/x/gamm/keeper/grpc_query.go b/x/gamm/keeper/grpc_query.go index 48f08cc89b1..7d7b494a1fc 100644 --- a/x/gamm/keeper/grpc_query.go +++ b/x/gamm/keeper/grpc_query.go @@ -194,7 +194,7 @@ func (q Querier) CalcExitPoolCoinsFromShares(ctx context.Context, req *types.Que } // SimJoinPoolNoSwap returns the amount of shares you'd get if joined a pool without a swap and tokens which need to be provided -func (q Querier) CalcJoinPoolNoSwap(ctx context.Context, req *types.QueryJoinPoolNoSwapRequest) (*types.QueryJoinPoolNoSwapResponse, error) { +func (q Querier) CalcJoinPoolNoSwap(ctx context.Context, req *types.QueryCalcJoinPoolNoSwapRequest) (*types.QueryCalcJoinPoolNoSwapResponse, error) { if req == nil { return nil, status.Error(codes.InvalidArgument, "empty request") } @@ -205,24 +205,13 @@ func (q Querier) CalcJoinPoolNoSwap(ctx context.Context, req *types.QueryJoinPoo return nil, err } - neededLpLiquidity, err := getMaximalNoSwapLPAmount(sdkCtx, pool, req.SharesOutAmount) + sharesOut, tokensJoined, err := pool.CalcJoinPoolNoSwapShares(sdkCtx, req.TokensIn, pool.GetSwapFee(sdkCtx)) if err != nil { return nil, err } - sharesOut, _, err := pool.CalcJoinPoolNoSwapShares(sdkCtx, neededLpLiquidity, pool.GetSwapFee(sdkCtx)) - if err != nil { - return nil, err - } - - // sanity check - if sharesOut.LT(req.SharesOutAmount) { - return nil, fmt.Errorf("Expected to JoinPoolNoSwap >= %s shares, actually did %s shares", - req.SharesOutAmount, sharesOut) - } - - return &types.QueryJoinPoolNoSwapResponse{ - TokensIn: neededLpLiquidity, + return &types.QueryCalcJoinPoolNoSwapResponse{ + TokensOut: tokensJoined, SharesOut: sharesOut, }, nil } diff --git a/x/gamm/keeper/grpc_query_test.go b/x/gamm/keeper/grpc_query_test.go index 10e0cfb531b..6293e11d252 100644 --- a/x/gamm/keeper/grpc_query_test.go +++ b/x/gamm/keeper/grpc_query_test.go @@ -87,63 +87,63 @@ func (suite *KeeperTestSuite) TestCalcExitPoolCoinsFromShares() { } } -func (suite *KeeperTestSuite) TestCalcJoinPoolNoSwap() { +func (suite *KeeperTestSuite) TestCalcJoinPoolNoSwapShares() { queryClient := suite.queryClient - poolId := suite.PrepareBalancerPool() ctx := suite.Ctx + poolId := suite.PrepareBalancerPool() + swapFee := sdk.ZeroDec() testCases := []struct { - name string - sharesOutAmount sdk.Int - poolId uint64 - expectingErr bool + name string + poolId uint64 + tokensIn sdk.Coins + expectedErr error }{ { - name: "valid test case", - sharesOutAmount: types.OneShare.MulRaw(50), - poolId: poolId, - - expectingErr: false, + "valid uneven multi asset join test case", + poolId, + sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(5000000)), sdk.NewCoin("bar", sdk.NewInt(5000000)), sdk.NewCoin("baz", sdk.NewInt(5000000)), sdk.NewCoin("uosmo", sdk.NewInt(5000000))), + nil, }, { - name: "invalid pool id", - sharesOutAmount: types.OneShare.MulRaw(50), - poolId: poolId + 1, - - expectingErr: true, + "valid even multi asset join test case", + poolId, + sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(500000)), sdk.NewCoin("bar", sdk.NewInt(1000000)), sdk.NewCoin("baz", sdk.NewInt(1500000)), sdk.NewCoin("uosmo", sdk.NewInt(2000000))), + nil, }, { - name: "negative shares out", - sharesOutAmount: sdk.NewInt(-1), - poolId: poolId, - - expectingErr: true, + "valid single asset join test case", + poolId, + sdk.NewCoins(sdk.NewCoin("uosmo", sdk.NewInt(1000000))), + nil, }, { - name: "no pool id", - sharesOutAmount: sdk.NewInt(-1), - - expectingErr: true, + "pool id does not exist", + poolId + 1, + sdk.NewCoins(sdk.NewCoin("uosmo", sdk.NewInt(1000000))), + types.PoolDoesNotExistError{PoolId: poolId + 1}, }, { - name: "zero shares", - sharesOutAmount: sdk.ZeroInt(), - poolId: poolId, - - expectingErr: true, + "token in denom does not exist", + poolId, + sdk.NewCoins(sdk.NewCoin("random", sdk.NewInt(10000))), + sdkerrors.Wrapf(types.ErrDenomNotFoundInPool, "input denoms must already exist in the pool (%s)", "random"), + }, + { + "join pool with incorrect amount of assets", + poolId, + sdk.NewCoins(sdk.NewCoin("uosmo", sdk.NewInt(10000)), sdk.NewCoin("bar", sdk.NewInt(10000))), + errors.New("balancer pool only supports LP'ing with one asset or all assets in pool"), }, } for _, tc := range testCases { suite.Run(tc.name, func() { - out, err := queryClient.CalcJoinPoolNoSwap(gocontext.Background(), &types.QueryJoinPoolNoSwapRequest{ - PoolId: tc.poolId, - SharesOutAmount: tc.sharesOutAmount, + out, err := queryClient.CalcJoinPoolNoSwap(gocontext.Background(), &types.QueryCalcJoinPoolNoSwapRequest{ + PoolId: tc.poolId, + TokensIn: tc.tokensIn, }) - - if !tc.expectingErr { - suite.Require().NoError(err) - + if tc.expectedErr == nil { poolRes, err := queryClient.Pool(gocontext.Background(), &types.QueryPoolRequest{ PoolId: tc.poolId, }) @@ -153,21 +153,16 @@ func (suite *KeeperTestSuite) TestCalcJoinPoolNoSwap() { err = suite.App.InterfaceRegistry().UnpackAny(poolRes.Pool, &pool) suite.Require().NoError(err) - liquidityBefore := pool.GetTotalPoolLiquidity(ctx) - - neededLpLiquidity, err := suite.App.GAMMKeeper.GetMaximalNoSwapLPAmount(ctx, pool, tc.sharesOutAmount) - suite.Require().NoError(err) - expectedShares, _, err := pool.CalcJoinPoolNoSwapShares(ctx, neededLpLiquidity, pool.GetSwapFee(ctx)) + numShares, numLiquidity, err := pool.CalcJoinPoolNoSwapShares(ctx, tc.tokensIn, swapFee) suite.Require().NoError(err) - - suite.Require().Equal(out.SharesOut, expectedShares) - suite.Require().Equal(out.TokensIn, neededLpLiquidity) - suite.Require().Equal(liquidityBefore, pool.GetTotalPoolLiquidity(ctx)) + suite.Require().Equal(numShares, out.SharesOut) + suite.Require().Equal(numLiquidity, out.TokensOut) } else { - suite.Require().Error(err) + suite.Require().EqualError(err, tc.expectedErr.Error()) } }) } + } func (suite *KeeperTestSuite) TestCalcJoinPoolShares() { queryClient := suite.queryClient diff --git a/x/gamm/types/query.pb.go b/x/gamm/types/query.pb.go index 4afa44ea021..ddb13c4ca49 100644 --- a/x/gamm/types/query.pb.go +++ b/x/gamm/types/query.pb.go @@ -852,23 +852,23 @@ func (m *QueryTotalSharesResponse) GetTotalShares() types1.Coin { } // =============================== SimJoinPoolNoSwap -type QueryJoinPoolNoSwapRequest struct { - PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"` - SharesOutAmount github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_out_amount,json=sharesOutAmount,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_out_amount"` +type QueryCalcJoinPoolNoSwapRequest struct { + PoolId uint64 `protobuf:"varint,1,opt,name=pool_id,json=poolId,proto3" json:"pool_id,omitempty" yaml:"pool_id"` + TokensIn github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,2,opt,name=tokens_in,json=tokensIn,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_in" yaml:"tokens_in"` } -func (m *QueryJoinPoolNoSwapRequest) Reset() { *m = QueryJoinPoolNoSwapRequest{} } -func (m *QueryJoinPoolNoSwapRequest) String() string { return proto.CompactTextString(m) } -func (*QueryJoinPoolNoSwapRequest) ProtoMessage() {} -func (*QueryJoinPoolNoSwapRequest) Descriptor() ([]byte, []int) { +func (m *QueryCalcJoinPoolNoSwapRequest) Reset() { *m = QueryCalcJoinPoolNoSwapRequest{} } +func (m *QueryCalcJoinPoolNoSwapRequest) String() string { return proto.CompactTextString(m) } +func (*QueryCalcJoinPoolNoSwapRequest) ProtoMessage() {} +func (*QueryCalcJoinPoolNoSwapRequest) Descriptor() ([]byte, []int) { return fileDescriptor_d9a717df9ca609ef, []int{18} } -func (m *QueryJoinPoolNoSwapRequest) XXX_Unmarshal(b []byte) error { +func (m *QueryCalcJoinPoolNoSwapRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryJoinPoolNoSwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryCalcJoinPoolNoSwapRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryJoinPoolNoSwapRequest.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryCalcJoinPoolNoSwapRequest.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -878,42 +878,42 @@ func (m *QueryJoinPoolNoSwapRequest) XXX_Marshal(b []byte, deterministic bool) ( return b[:n], nil } } -func (m *QueryJoinPoolNoSwapRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryJoinPoolNoSwapRequest.Merge(m, src) +func (m *QueryCalcJoinPoolNoSwapRequest) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryCalcJoinPoolNoSwapRequest.Merge(m, src) } -func (m *QueryJoinPoolNoSwapRequest) XXX_Size() int { +func (m *QueryCalcJoinPoolNoSwapRequest) XXX_Size() int { return m.Size() } -func (m *QueryJoinPoolNoSwapRequest) XXX_DiscardUnknown() { - xxx_messageInfo_QueryJoinPoolNoSwapRequest.DiscardUnknown(m) +func (m *QueryCalcJoinPoolNoSwapRequest) XXX_DiscardUnknown() { + xxx_messageInfo_QueryCalcJoinPoolNoSwapRequest.DiscardUnknown(m) } -var xxx_messageInfo_QueryJoinPoolNoSwapRequest proto.InternalMessageInfo +var xxx_messageInfo_QueryCalcJoinPoolNoSwapRequest proto.InternalMessageInfo -func (m *QueryJoinPoolNoSwapRequest) GetPoolId() uint64 { +func (m *QueryCalcJoinPoolNoSwapRequest) GetPoolId() uint64 { if m != nil { return m.PoolId } return 0 } -type QueryJoinPoolNoSwapResponse struct { - TokensIn github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=tokens_in,json=tokensIn,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_in" yaml:"tokens_in"` +type QueryCalcJoinPoolNoSwapResponse struct { + TokensOut github_com_cosmos_cosmos_sdk_types.Coins `protobuf:"bytes,1,rep,name=tokens_out,json=tokensOut,proto3,castrepeated=github.com/cosmos/cosmos-sdk/types.Coins" json:"tokens_out" yaml:"tokens_out"` SharesOut github_com_cosmos_cosmos_sdk_types.Int `protobuf:"bytes,2,opt,name=shares_out,json=sharesOut,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Int" json:"shares_out"` } -func (m *QueryJoinPoolNoSwapResponse) Reset() { *m = QueryJoinPoolNoSwapResponse{} } -func (m *QueryJoinPoolNoSwapResponse) String() string { return proto.CompactTextString(m) } -func (*QueryJoinPoolNoSwapResponse) ProtoMessage() {} -func (*QueryJoinPoolNoSwapResponse) Descriptor() ([]byte, []int) { +func (m *QueryCalcJoinPoolNoSwapResponse) Reset() { *m = QueryCalcJoinPoolNoSwapResponse{} } +func (m *QueryCalcJoinPoolNoSwapResponse) String() string { return proto.CompactTextString(m) } +func (*QueryCalcJoinPoolNoSwapResponse) ProtoMessage() {} +func (*QueryCalcJoinPoolNoSwapResponse) Descriptor() ([]byte, []int) { return fileDescriptor_d9a717df9ca609ef, []int{19} } -func (m *QueryJoinPoolNoSwapResponse) XXX_Unmarshal(b []byte) error { +func (m *QueryCalcJoinPoolNoSwapResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) } -func (m *QueryJoinPoolNoSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { +func (m *QueryCalcJoinPoolNoSwapResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { if deterministic { - return xxx_messageInfo_QueryJoinPoolNoSwapResponse.Marshal(b, m, deterministic) + return xxx_messageInfo_QueryCalcJoinPoolNoSwapResponse.Marshal(b, m, deterministic) } else { b = b[:cap(b)] n, err := m.MarshalToSizedBuffer(b) @@ -923,21 +923,21 @@ func (m *QueryJoinPoolNoSwapResponse) XXX_Marshal(b []byte, deterministic bool) return b[:n], nil } } -func (m *QueryJoinPoolNoSwapResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_QueryJoinPoolNoSwapResponse.Merge(m, src) +func (m *QueryCalcJoinPoolNoSwapResponse) XXX_Merge(src proto.Message) { + xxx_messageInfo_QueryCalcJoinPoolNoSwapResponse.Merge(m, src) } -func (m *QueryJoinPoolNoSwapResponse) XXX_Size() int { +func (m *QueryCalcJoinPoolNoSwapResponse) XXX_Size() int { return m.Size() } -func (m *QueryJoinPoolNoSwapResponse) XXX_DiscardUnknown() { - xxx_messageInfo_QueryJoinPoolNoSwapResponse.DiscardUnknown(m) +func (m *QueryCalcJoinPoolNoSwapResponse) XXX_DiscardUnknown() { + xxx_messageInfo_QueryCalcJoinPoolNoSwapResponse.DiscardUnknown(m) } -var xxx_messageInfo_QueryJoinPoolNoSwapResponse proto.InternalMessageInfo +var xxx_messageInfo_QueryCalcJoinPoolNoSwapResponse proto.InternalMessageInfo -func (m *QueryJoinPoolNoSwapResponse) GetTokensIn() github_com_cosmos_cosmos_sdk_types.Coins { +func (m *QueryCalcJoinPoolNoSwapResponse) GetTokensOut() github_com_cosmos_cosmos_sdk_types.Coins { if m != nil { - return m.TokensIn + return m.TokensOut } return nil } @@ -1362,8 +1362,8 @@ func init() { proto.RegisterType((*QueryTotalPoolLiquidityResponse)(nil), "osmosis.gamm.v1beta1.QueryTotalPoolLiquidityResponse") proto.RegisterType((*QueryTotalSharesRequest)(nil), "osmosis.gamm.v1beta1.QueryTotalSharesRequest") proto.RegisterType((*QueryTotalSharesResponse)(nil), "osmosis.gamm.v1beta1.QueryTotalSharesResponse") - proto.RegisterType((*QueryJoinPoolNoSwapRequest)(nil), "osmosis.gamm.v1beta1.QueryJoinPoolNoSwapRequest") - proto.RegisterType((*QueryJoinPoolNoSwapResponse)(nil), "osmosis.gamm.v1beta1.QueryJoinPoolNoSwapResponse") + proto.RegisterType((*QueryCalcJoinPoolNoSwapRequest)(nil), "osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapRequest") + proto.RegisterType((*QueryCalcJoinPoolNoSwapResponse)(nil), "osmosis.gamm.v1beta1.QueryCalcJoinPoolNoSwapResponse") proto.RegisterType((*QuerySpotPriceRequest)(nil), "osmosis.gamm.v1beta1.QuerySpotPriceRequest") proto.RegisterType((*QuerySpotPriceResponse)(nil), "osmosis.gamm.v1beta1.QuerySpotPriceResponse") proto.RegisterType((*QuerySwapExactAmountInRequest)(nil), "osmosis.gamm.v1beta1.QuerySwapExactAmountInRequest") @@ -1377,113 +1377,113 @@ func init() { func init() { proto.RegisterFile("osmosis/gamm/v1beta1/query.proto", fileDescriptor_d9a717df9ca609ef) } var fileDescriptor_d9a717df9ca609ef = []byte{ - // 1685 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xdd, 0x6f, 0x14, 0x55, - 0x1b, 0xef, 0x94, 0xb6, 0x74, 0x4f, 0x5f, 0xfa, 0x71, 0x28, 0x50, 0xb6, 0xb0, 0xcb, 0x7b, 0xde, - 0xbc, 0xb4, 0x40, 0x3b, 0x4b, 0x4b, 0x49, 0x4c, 0x23, 0x1f, 0x2d, 0xb4, 0xb0, 0x8d, 0xd0, 0x3a, - 0x10, 0x8c, 0x78, 0xb1, 0x99, 0xb6, 0xe3, 0x76, 0x60, 0x77, 0xce, 0x74, 0xe7, 0x0c, 0x6d, 0x83, - 0xc4, 0x84, 0x18, 0xaf, 0xbc, 0x30, 0x41, 0xb9, 0x30, 0x24, 0x7a, 0xa1, 0x89, 0xf1, 0xda, 0xc4, - 0x3f, 0xc0, 0x98, 0x10, 0x13, 0x13, 0x8c, 0x37, 0xc6, 0x8b, 0xd5, 0x50, 0x4d, 0x8c, 0x97, 0xfd, - 0x07, 0x34, 0xe7, 0x9c, 0x67, 0x3e, 0x76, 0x3b, 0x3b, 0xfb, 0xa1, 0x24, 0x5e, 0x75, 0xe7, 0x3c, - 0x5f, 0xbf, 0xe7, 0xe3, 0x3c, 0xe7, 0x79, 0x8a, 0x8e, 0x51, 0xa7, 0x48, 0x1d, 0xd3, 0xc9, 0xe4, - 0xf5, 0x62, 0x31, 0x73, 0x6f, 0x62, 0xd9, 0x60, 0xfa, 0x44, 0x66, 0xdd, 0x35, 0x4a, 0x5b, 0xaa, - 0x5d, 0xa2, 0x8c, 0xe2, 0x41, 0xe0, 0x50, 0x39, 0x87, 0x0a, 0x1c, 0xc9, 0xc1, 0x3c, 0xcd, 0x53, - 0xc1, 0x90, 0xe1, 0xbf, 0x24, 0x6f, 0xf2, 0x68, 0xa4, 0x36, 0xb6, 0x09, 0xe4, 0xd4, 0x8a, 0xa0, - 0x67, 0x96, 0x75, 0xc7, 0xf0, 0xa9, 0x2b, 0xd4, 0xb4, 0x80, 0x7e, 0x32, 0x4c, 0x17, 0x18, 0x7c, - 0x2e, 0x5b, 0xcf, 0x9b, 0x96, 0xce, 0x4c, 0xea, 0xf1, 0x1e, 0xc9, 0x53, 0x9a, 0x2f, 0x18, 0x19, - 0xdd, 0x36, 0x33, 0xba, 0x65, 0x51, 0x26, 0x88, 0x0e, 0x50, 0x0f, 0x03, 0x55, 0x7c, 0x2d, 0xbb, - 0x6f, 0x66, 0x74, 0x6b, 0xcb, 0x23, 0x49, 0x23, 0x39, 0x09, 0x5e, 0x7e, 0x48, 0x12, 0xb9, 0x80, - 0xfa, 0x5f, 0xe5, 0x56, 0x97, 0x28, 0x2d, 0x68, 0xc6, 0xba, 0x6b, 0x38, 0x0c, 0x9f, 0x42, 0x7b, - 0x6d, 0x4a, 0x0b, 0x39, 0x73, 0x75, 0x48, 0x39, 0xa6, 0x8c, 0x76, 0xcc, 0xe2, 0x9d, 0x72, 0xba, - 0x77, 0x4b, 0x2f, 0x16, 0xa6, 0x09, 0x10, 0x88, 0xd6, 0xc5, 0x7f, 0x65, 0x57, 0xc9, 0x55, 0x34, - 0x10, 0x52, 0xe0, 0xd8, 0xd4, 0x72, 0x0c, 0x7c, 0x06, 0x75, 0x70, 0xb2, 0x10, 0xef, 0x99, 0x1c, - 0x54, 0x25, 0x34, 0xd5, 0x83, 0xa6, 0xce, 0x58, 0x5b, 0xb3, 0x89, 0x6f, 0xbf, 0x1c, 0xef, 0xe4, - 0x52, 0x59, 0x4d, 0x30, 0x93, 0x37, 0x42, 0x9a, 0x1c, 0x0f, 0xcb, 0x3c, 0x42, 0x41, 0x1c, 0x86, - 0xda, 0x85, 0xbe, 0xe3, 0x2a, 0xb8, 0xc0, 0x83, 0xa6, 0xca, 0xc4, 0x41, 0xd0, 0xd4, 0x25, 0x3d, - 0x6f, 0x80, 0xac, 0x16, 0x92, 0x24, 0x1f, 0x28, 0x08, 0x87, 0xb5, 0x03, 0xd0, 0xb3, 0xa8, 0x93, - 0xdb, 0x76, 0x86, 0x94, 0x63, 0x7b, 0x1a, 0x41, 0x2a, 0xb9, 0xf1, 0x95, 0x08, 0x54, 0x23, 0x75, - 0x51, 0x49, 0x9b, 0x15, 0xb0, 0x0e, 0xa2, 0x41, 0x81, 0xea, 0xba, 0x5b, 0x0c, 0xbb, 0x4d, 0x16, - 0xd0, 0x81, 0xaa, 0x73, 0x00, 0x3c, 0x81, 0x12, 0x96, 0x5b, 0xcc, 0x79, 0xa0, 0x79, 0x76, 0x06, - 0x77, 0xca, 0xe9, 0x7e, 0x99, 0x1d, 0x9f, 0x44, 0xb4, 0x6e, 0x0b, 0x44, 0xc9, 0x25, 0xb0, 0xc1, - 0xbf, 0x6e, 0x6e, 0xd9, 0x46, 0x4b, 0x69, 0xf6, 0x00, 0x05, 0x4a, 0x02, 0x40, 0x82, 0x99, 0x6d, - 0xd9, 0x86, 0xd0, 0x93, 0x08, 0x03, 0xf2, 0x49, 0x44, 0xeb, 0xb6, 0x41, 0x94, 0x7c, 0xa5, 0xa0, - 0x94, 0x50, 0x76, 0x49, 0x2f, 0xac, 0x2c, 0x50, 0xd3, 0xe2, 0x4a, 0x6f, 0xac, 0xe9, 0x25, 0xc3, - 0x69, 0x05, 0x1b, 0x5e, 0x43, 0x09, 0x46, 0xef, 0x1a, 0x96, 0x93, 0x33, 0x79, 0x32, 0x78, 0x22, - 0x0f, 0x57, 0x24, 0xc3, 0x4b, 0xc3, 0x25, 0x6a, 0x5a, 0xb3, 0xa7, 0x9f, 0x96, 0xd3, 0x6d, 0x5f, - 0xfc, 0x9c, 0x1e, 0xcd, 0x9b, 0x6c, 0xcd, 0x5d, 0x56, 0x57, 0x68, 0x11, 0xae, 0x04, 0xfc, 0x19, - 0x77, 0x56, 0xef, 0x66, 0x38, 0x66, 0x47, 0x08, 0x38, 0x5a, 0xb7, 0xd4, 0x9e, 0xb5, 0xc8, 0xc3, - 0x76, 0x94, 0xae, 0x89, 0x1c, 0x02, 0xe2, 0xa0, 0x7e, 0x87, 0x9f, 0xe4, 0xa8, 0xcb, 0x72, 0x7a, - 0x91, 0xba, 0x16, 0x83, 0xb8, 0x64, 0xb9, 0xe5, 0x9f, 0xca, 0xe9, 0xe3, 0x0d, 0x58, 0xce, 0x5a, - 0x6c, 0xa7, 0x9c, 0x3e, 0x24, 0x3d, 0xae, 0xd6, 0x47, 0xb4, 0x5e, 0x71, 0xb4, 0xe8, 0xb2, 0x19, - 0x71, 0x80, 0xef, 0x20, 0x04, 0x21, 0xa0, 0x2e, 0x7b, 0x11, 0x31, 0x80, 0x08, 0x2f, 0xba, 0x8c, - 0x7c, 0xa4, 0xa0, 0x11, 0x3f, 0x08, 0x73, 0x9b, 0x26, 0xe3, 0x41, 0x10, 0x5c, 0xf3, 0x25, 0x5a, - 0xac, 0xcc, 0xe3, 0xa1, 0xaa, 0x3c, 0xfa, 0x39, 0xbb, 0x85, 0xfa, 0xa4, 0x57, 0xa6, 0xe5, 0x05, - 0xa9, 0x5d, 0x04, 0x49, 0x6d, 0x2e, 0x48, 0xda, 0x3e, 0xa1, 0x26, 0x6b, 0xc9, 0x40, 0x90, 0xc7, - 0x0a, 0x1a, 0xad, 0x0f, 0x0e, 0x52, 0x55, 0x19, 0x35, 0xe5, 0x85, 0x46, 0x6d, 0x0e, 0x1d, 0xf4, - 0x2f, 0xd0, 0x92, 0x5e, 0xd2, 0x8b, 0x2d, 0xd5, 0x3a, 0xb9, 0x82, 0x0e, 0xed, 0x52, 0x03, 0xde, - 0x8c, 0xa1, 0x2e, 0x5b, 0x9c, 0xc4, 0xb5, 0x5d, 0x0d, 0x78, 0xc8, 0x35, 0xb8, 0x83, 0x37, 0x29, - 0xd3, 0x0b, 0x5c, 0xdb, 0x2b, 0xe6, 0xba, 0x6b, 0xae, 0x9a, 0x6c, 0xab, 0x25, 0x5c, 0x9f, 0x28, - 0x70, 0x33, 0xa2, 0xf4, 0x01, 0xc0, 0x07, 0x28, 0x51, 0xf0, 0x0e, 0xeb, 0x47, 0xfb, 0x32, 0x8f, - 0x76, 0xd0, 0x49, 0x7c, 0x49, 0xd2, 0x5c, 0x06, 0x02, 0xb9, 0x79, 0x08, 0x9d, 0x40, 0xd8, 0x7a, - 0xbb, 0x21, 0x2e, 0x1a, 0xda, 0xad, 0x07, 0x5c, 0x7c, 0x1d, 0xfd, 0x87, 0xf1, 0xe3, 0x9c, 0xa8, - 0x4a, 0x2f, 0x13, 0x31, 0x5e, 0x0e, 0x83, 0x97, 0xfb, 0xa5, 0xb1, 0xb0, 0x30, 0xd1, 0x7a, 0x58, - 0x60, 0x82, 0x7c, 0xa6, 0xa0, 0xa4, 0xb0, 0xeb, 0xf5, 0x9d, 0xeb, 0xf4, 0xc6, 0x86, 0x6e, 0xb7, - 0xd4, 0x31, 0x6f, 0xa3, 0x01, 0x69, 0x23, 0xdc, 0xa4, 0x5a, 0xbb, 0x7f, 0xf2, 0x1a, 0x3b, 0x7e, - 0x2b, 0x22, 0x7f, 0x28, 0x68, 0x38, 0x12, 0x27, 0x84, 0xe8, 0xad, 0x70, 0xb7, 0x6e, 0xb6, 0x0a, - 0x7c, 0x49, 0xd2, 0x5a, 0x07, 0xc7, 0xd7, 0x10, 0x0a, 0x3c, 0x6f, 0xd1, 0xe5, 0x84, 0xef, 0x32, - 0xf9, 0x5d, 0x81, 0x77, 0xf1, 0x86, 0x4d, 0xd9, 0x52, 0xc9, 0x5c, 0x69, 0xe9, 0x75, 0xc5, 0x73, - 0xa8, 0x9f, 0xbb, 0x9e, 0xd3, 0x1d, 0xc7, 0x60, 0xb9, 0x55, 0xc3, 0xa2, 0x45, 0xc0, 0x36, 0x1c, - 0xbc, 0x02, 0xd5, 0x1c, 0x44, 0xeb, 0xe5, 0x47, 0x33, 0xfc, 0xe4, 0x32, 0x3f, 0xc0, 0x57, 0xd1, - 0xc0, 0xba, 0x4b, 0x59, 0xa5, 0x9e, 0x3d, 0x42, 0xcf, 0x91, 0x9d, 0x72, 0x7a, 0x48, 0xea, 0xd9, - 0xc5, 0x42, 0xb4, 0x3e, 0x71, 0x16, 0x68, 0x5a, 0xe8, 0xe8, 0xee, 0xe8, 0xef, 0xd4, 0x7a, 0x36, - 0x4c, 0xb6, 0xc6, 0x93, 0x37, 0x6f, 0x18, 0xe4, 0x3a, 0x34, 0xb0, 0x90, 0xa7, 0x90, 0xd1, 0x29, - 0x84, 0x1c, 0x9b, 0xb2, 0x9c, 0xcd, 0x4f, 0xe1, 0xad, 0x3b, 0xb0, 0x53, 0x4e, 0x0f, 0xc0, 0xeb, - 0xe5, 0xd3, 0x88, 0x96, 0x70, 0x3c, 0x69, 0xf2, 0xa7, 0x82, 0x8e, 0x4a, 0x85, 0x1b, 0xba, 0x3d, - 0xb7, 0xa9, 0xaf, 0x40, 0x01, 0x65, 0x2d, 0x2f, 0x84, 0x27, 0x50, 0x97, 0x63, 0x58, 0xab, 0x46, - 0x09, 0x74, 0x0e, 0xec, 0x94, 0xd3, 0xfb, 0x40, 0xa7, 0x38, 0x27, 0x1a, 0x30, 0x84, 0xa3, 0xdd, - 0x5e, 0x37, 0xda, 0x2a, 0x92, 0xf5, 0xc0, 0x0b, 0x50, 0x46, 0x67, 0xff, 0x4e, 0x39, 0xdd, 0x17, - 0xaa, 0x30, 0x5e, 0x60, 0xda, 0x5e, 0xf1, 0x33, 0x6b, 0xe1, 0x5b, 0xa8, 0xab, 0x44, 0x5d, 0x66, - 0x38, 0x43, 0x1d, 0xa2, 0x5c, 0x47, 0xd4, 0xa8, 0xfd, 0x40, 0xe5, 0x7e, 0xf8, 0x2e, 0x70, 0xfe, - 0xd9, 0x03, 0x50, 0xbc, 0x00, 0x5a, 0x2a, 0x21, 0x1a, 0x68, 0x23, 0x1f, 0x7a, 0x73, 0x50, 0x44, - 0x04, 0x82, 0x61, 0x42, 0x02, 0xfa, 0xe7, 0x86, 0x89, 0x6a, 0x7d, 0x44, 0xeb, 0x15, 0x47, 0xc1, - 0x0d, 0x7e, 0xa7, 0x3d, 0x1a, 0xd7, 0xa2, 0xcb, 0x5e, 0x74, 0x6a, 0x5e, 0xf3, 0x43, 0xbd, 0x47, - 0x84, 0x7a, 0xb4, 0x5e, 0xa8, 0x39, 0xa6, 0x06, 0x62, 0xcd, 0xc7, 0x54, 0xdf, 0xf1, 0xa1, 0x8e, - 0xea, 0x31, 0xd5, 0x27, 0x11, 0x68, 0x15, 0xfc, 0x6e, 0x3f, 0xf2, 0x9e, 0xb4, 0xa8, 0x30, 0x40, - 0x7e, 0x6c, 0xd4, 0xe7, 0x15, 0x4c, 0x65, 0x7a, 0xae, 0x36, 0x9d, 0x9e, 0x83, 0x95, 0xf5, 0xe7, - 0x67, 0x67, 0x1f, 0x94, 0x21, 0x24, 0xe7, 0x08, 0xbc, 0x02, 0xe2, 0xf5, 0xa9, 0x7e, 0xb3, 0xc9, - 0x13, 0xaf, 0xf9, 0x56, 0x93, 0xff, 0x15, 0x4f, 0xf0, 0xe4, 0x36, 0x46, 0x9d, 0x02, 0x1e, 0x7e, - 0x1b, 0x89, 0x8d, 0xca, 0xc1, 0x35, 0x2e, 0xd3, 0xae, 0x4d, 0x30, 0x39, 0x5a, 0x9f, 0x51, 0x3a, - 0x49, 0xfe, 0xf7, 0xf0, 0x87, 0x5f, 0x1f, 0xb5, 0x1f, 0xc5, 0xc3, 0x99, 0xc8, 0xdd, 0x5c, 0xae, - 0x70, 0xef, 0x29, 0xa8, 0xdb, 0xdb, 0xae, 0xf0, 0xc9, 0x18, 0xdd, 0x55, 0xab, 0x59, 0xf2, 0x54, - 0x43, 0xbc, 0x00, 0x65, 0x44, 0x40, 0xf9, 0x2f, 0x4e, 0x47, 0x43, 0xf1, 0xf7, 0x35, 0xfc, 0xa9, - 0x82, 0x7a, 0x2b, 0x73, 0x86, 0x4f, 0xc7, 0x18, 0x8a, 0xcc, 0x7e, 0x72, 0xa2, 0x09, 0x09, 0x00, - 0x38, 0x2e, 0x00, 0x8e, 0xe0, 0xff, 0x47, 0x03, 0x94, 0xf3, 0x88, 0x9f, 0x40, 0xfc, 0xae, 0x82, - 0x3a, 0xb8, 0x87, 0xf8, 0x78, 0x9d, 0x6c, 0x78, 0x90, 0x46, 0xea, 0xf2, 0x35, 0x06, 0x44, 0x44, - 0x29, 0x73, 0x1f, 0x1a, 0xc6, 0x03, 0xfc, 0x58, 0x41, 0xdd, 0xde, 0x2e, 0x1a, 0x9b, 0xbe, 0xaa, - 0xad, 0x37, 0x36, 0x7d, 0xd5, 0xcb, 0x2d, 0x99, 0x10, 0xa0, 0x4e, 0xe1, 0x13, 0xb5, 0x41, 0x89, - 0xed, 0x36, 0x04, 0xec, 0x3e, 0xc2, 0xe1, 0xe5, 0x50, 0x0e, 0x3f, 0xb1, 0xb9, 0x8c, 0x9c, 0xe7, - 0x62, 0x73, 0x19, 0x3d, 0x59, 0x91, 0x36, 0xfc, 0xb5, 0x52, 0x69, 0x5d, 0x8e, 0x8e, 0x78, 0x2a, - 0x46, 0x57, 0xcd, 0x1d, 0x3c, 0x79, 0xb6, 0x49, 0x29, 0x40, 0x71, 0x51, 0xc4, 0x6c, 0x1a, 0xbf, - 0xd4, 0x50, 0x22, 0x33, 0x77, 0xa8, 0x69, 0xe5, 0x9c, 0x0d, 0xdd, 0xce, 0x19, 0xbc, 0xc5, 0xe6, - 0x4c, 0x0b, 0xff, 0xa6, 0xa0, 0xe1, 0x98, 0xf5, 0x0d, 0x9f, 0xab, 0x03, 0x2c, 0x7e, 0x27, 0x4d, - 0x9e, 0x6f, 0x55, 0x1c, 0x1c, 0xbc, 0x22, 0x1c, 0x9c, 0xc1, 0x17, 0x1a, 0x73, 0xd0, 0xd8, 0x34, - 0x99, 0x74, 0x50, 0x2e, 0xbc, 0xb2, 0xaf, 0x73, 0x3f, 0x3f, 0x56, 0x10, 0x0a, 0xf6, 0x38, 0x3c, - 0x56, 0xa7, 0x32, 0x2b, 0xb6, 0xc6, 0xe4, 0x78, 0x83, 0xdc, 0x00, 0x7a, 0x4a, 0x80, 0x56, 0xf1, - 0x58, 0x63, 0xa0, 0xe5, 0x92, 0x88, 0xbf, 0x51, 0x10, 0xde, 0xbd, 0xd0, 0xc5, 0xd6, 0x53, 0xcd, - 0x7d, 0x32, 0xb6, 0x9e, 0x6a, 0x6f, 0x8d, 0x64, 0x56, 0x20, 0x7f, 0x19, 0x4f, 0x37, 0x86, 0x5c, - 0x76, 0x2c, 0xf1, 0x19, 0xb4, 0xad, 0xcf, 0x15, 0xd4, 0x13, 0x5a, 0xd7, 0xf0, 0x78, 0x3d, 0x28, - 0x95, 0x15, 0xa3, 0x36, 0xca, 0x0e, 0x90, 0xa7, 0x05, 0xe4, 0x29, 0x3c, 0xd9, 0x0c, 0x64, 0xb9, - 0x54, 0xe0, 0x27, 0x0a, 0x4a, 0xf8, 0x23, 0x36, 0x8e, 0xeb, 0x56, 0xd5, 0x2b, 0x47, 0x72, 0xac, - 0x31, 0xe6, 0x16, 0x2b, 0x82, 0x0b, 0x3b, 0xf8, 0x3b, 0x05, 0x1d, 0x9e, 0x73, 0x98, 0x59, 0xd4, - 0x99, 0xb1, 0x6b, 0x6c, 0xc5, 0x67, 0xe2, 0x10, 0xd4, 0x18, 0xf3, 0x93, 0x53, 0xcd, 0x09, 0x01, - 0xfc, 0x39, 0x01, 0xff, 0x02, 0x3e, 0x17, 0x0d, 0x3f, 0x74, 0xff, 0x00, 0x6d, 0x26, 0xd4, 0x64, - 0x82, 0x3b, 0xf8, 0xbd, 0x82, 0x92, 0x35, 0xfc, 0x59, 0x74, 0x19, 0x6e, 0x02, 0x5b, 0x30, 0x1d, - 0xc7, 0x56, 0x7a, 0xed, 0x61, 0x92, 0xcc, 0x0b, 0x97, 0x2e, 0xe2, 0xf3, 0x7f, 0xc3, 0x25, 0xea, - 0xb2, 0xd9, 0x85, 0xa7, 0xcf, 0x53, 0xca, 0xb3, 0xe7, 0x29, 0xe5, 0x97, 0xe7, 0x29, 0xe5, 0xfd, - 0xed, 0x54, 0xdb, 0xb3, 0xed, 0x54, 0xdb, 0x8f, 0xdb, 0xa9, 0xb6, 0xdb, 0xa7, 0x43, 0x43, 0x1b, - 0xd8, 0x18, 0x2f, 0xe8, 0xcb, 0x8e, 0x6f, 0xf0, 0xde, 0xc4, 0x64, 0x66, 0x53, 0x9a, 0x15, 0x23, - 0xdc, 0x72, 0x97, 0xf8, 0xe7, 0xd1, 0x99, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x9f, 0x91, 0x97, - 0x22, 0x35, 0x19, 0x00, 0x00, + // 1689 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5, + 0x17, 0xcf, 0xa6, 0x49, 0x1a, 0x4f, 0xbe, 0xcd, 0x8f, 0x69, 0xda, 0xa6, 0x4e, 0x6b, 0xf7, 0x3b, + 0x5f, 0x7d, 0x9b, 0xb4, 0x4d, 0xd6, 0x4d, 0x9a, 0x4a, 0x28, 0xa2, 0x3f, 0x92, 0x36, 0x69, 0x1d, + 0xd1, 0x36, 0x6c, 0xab, 0x22, 0xe0, 0x60, 0x6d, 0x92, 0xc5, 0xd9, 0xd6, 0xde, 0xd9, 0x78, 0x67, + 0x9b, 0x44, 0xa8, 0xaa, 0x54, 0x10, 0x27, 0x0e, 0x48, 0x85, 0x1e, 0x50, 0x25, 0x38, 0x70, 0x40, + 0x9c, 0x38, 0x20, 0xf1, 0x07, 0x20, 0xa4, 0x0a, 0x09, 0xa9, 0x88, 0x0b, 0xe2, 0x60, 0x50, 0x0b, + 0x12, 0x07, 0x2e, 0xe4, 0x1f, 0x00, 0xcd, 0xcc, 0xdb, 0x1f, 0xb6, 0xd7, 0xf6, 0xda, 0x50, 0x89, + 0x53, 0xbc, 0xf3, 0xde, 0xbc, 0xf9, 0xbc, 0xcf, 0x7b, 0xf3, 0xe6, 0xbd, 0xa0, 0x23, 0xd4, 0x29, + 0x52, 0xc7, 0x74, 0x32, 0x79, 0xbd, 0x58, 0xcc, 0xdc, 0x99, 0x5a, 0x31, 0x98, 0x3e, 0x95, 0xd9, + 0x70, 0x8d, 0xd2, 0xb6, 0x6a, 0x97, 0x28, 0xa3, 0x78, 0x18, 0x34, 0x54, 0xae, 0xa1, 0x82, 0x46, + 0x72, 0x38, 0x4f, 0xf3, 0x54, 0x28, 0x64, 0xf8, 0x2f, 0xa9, 0x9b, 0x3c, 0x1c, 0x69, 0x8d, 0x6d, + 0x81, 0x38, 0xb5, 0x2a, 0xe4, 0x99, 0x15, 0xdd, 0x31, 0x7c, 0xe9, 0x2a, 0x35, 0x2d, 0x90, 0x1f, + 0x0f, 0xcb, 0x05, 0x06, 0x5f, 0xcb, 0xd6, 0xf3, 0xa6, 0xa5, 0x33, 0x93, 0x7a, 0xba, 0x87, 0xf2, + 0x94, 0xe6, 0x0b, 0x46, 0x46, 0xb7, 0xcd, 0x8c, 0x6e, 0x59, 0x94, 0x09, 0xa1, 0x03, 0xd2, 0x83, + 0x20, 0x15, 0x5f, 0x2b, 0xee, 0x1b, 0x19, 0xdd, 0xda, 0xf6, 0x44, 0xf2, 0x90, 0x9c, 0x04, 0x2f, + 0x3f, 0xa4, 0x88, 0x9c, 0x43, 0x83, 0x2f, 0xf3, 0x53, 0x97, 0x29, 0x2d, 0x68, 0xc6, 0x86, 0x6b, + 0x38, 0x0c, 0x9f, 0x40, 0xbb, 0x6d, 0x4a, 0x0b, 0x39, 0x73, 0x6d, 0x44, 0x39, 0xa2, 0x8c, 0x77, + 0xcd, 0xe3, 0x9d, 0x72, 0xba, 0x7f, 0x5b, 0x2f, 0x16, 0x66, 0x09, 0x08, 0x88, 0xd6, 0xc3, 0x7f, + 0x65, 0xd7, 0xc8, 0x65, 0x34, 0x14, 0x32, 0xe0, 0xd8, 0xd4, 0x72, 0x0c, 0x7c, 0x0a, 0x75, 0x71, + 0xb1, 0xd8, 0xde, 0x37, 0x3d, 0xac, 0x4a, 0x68, 0xaa, 0x07, 0x4d, 0x9d, 0xb3, 0xb6, 0xe7, 0x13, + 0xdf, 0x7c, 0x31, 0xd9, 0xcd, 0x77, 0x65, 0x35, 0xa1, 0x4c, 0x5e, 0x0f, 0x59, 0x72, 0x3c, 0x2c, + 0x8b, 0x08, 0x05, 0x3c, 0x8c, 0x74, 0x0a, 0x7b, 0x47, 0x55, 0x70, 0x81, 0x93, 0xa6, 0xca, 0xc0, + 0x01, 0x69, 0xea, 0xb2, 0x9e, 0x37, 0x60, 0xaf, 0x16, 0xda, 0x49, 0xde, 0x57, 0x10, 0x0e, 0x5b, + 0x07, 0xa0, 0xa7, 0x51, 0x37, 0x3f, 0xdb, 0x19, 0x51, 0x8e, 0xec, 0x8a, 0x83, 0x54, 0x6a, 0xe3, + 0x4b, 0x11, 0xa8, 0xc6, 0x9a, 0xa2, 0x92, 0x67, 0x56, 0xc0, 0xda, 0x8f, 0x86, 0x05, 0xaa, 0xab, + 0x6e, 0x31, 0xec, 0x36, 0x59, 0x42, 0xfb, 0xaa, 0xd6, 0x01, 0xf0, 0x14, 0x4a, 0x58, 0x6e, 0x31, + 0xe7, 0x81, 0xe6, 0xd1, 0x19, 0xde, 0x29, 0xa7, 0x07, 0x65, 0x74, 0x7c, 0x11, 0xd1, 0x7a, 0x2d, + 0xd8, 0x4a, 0x2e, 0xc0, 0x19, 0xfc, 0xeb, 0xc6, 0xb6, 0x6d, 0xb4, 0x15, 0x66, 0x0f, 0x50, 0x60, + 0x24, 0x00, 0x24, 0x94, 0xd9, 0xb6, 0x6d, 0x08, 0x3b, 0x89, 0x30, 0x20, 0x5f, 0x44, 0xb4, 0x5e, + 0x1b, 0xb6, 0x92, 0x2f, 0x15, 0x94, 0x12, 0xc6, 0x2e, 0xe8, 0x85, 0xd5, 0x25, 0x6a, 0x5a, 0xdc, + 0xe8, 0xf5, 0x75, 0xbd, 0x64, 0x38, 0xed, 0x60, 0xc3, 0xeb, 0x28, 0xc1, 0xe8, 0x6d, 0xc3, 0x72, + 0x72, 0x26, 0x0f, 0x06, 0x0f, 0xe4, 0xc1, 0x8a, 0x60, 0x78, 0x61, 0xb8, 0x40, 0x4d, 0x6b, 0xfe, + 0xe4, 0xe3, 0x72, 0xba, 0xe3, 0xb3, 0x9f, 0xd2, 0xe3, 0x79, 0x93, 0xad, 0xbb, 0x2b, 0xea, 0x2a, + 0x2d, 0xc2, 0x95, 0x80, 0x3f, 0x93, 0xce, 0xda, 0xed, 0x0c, 0xc7, 0xec, 0x88, 0x0d, 0x8e, 0xd6, + 0x2b, 0xad, 0x67, 0x2d, 0x72, 0xbf, 0x13, 0xa5, 0xeb, 0x22, 0x07, 0x42, 0x1c, 0x34, 0xe8, 0xf0, + 0x95, 0x1c, 0x75, 0x59, 0x4e, 0x2f, 0x52, 0xd7, 0x62, 0xc0, 0x4b, 0x96, 0x9f, 0xfc, 0x63, 0x39, + 0x7d, 0x34, 0xc6, 0xc9, 0x59, 0x8b, 0xed, 0x94, 0xd3, 0x07, 0xa4, 0xc7, 0xd5, 0xf6, 0x88, 0xd6, + 0x2f, 0x96, 0xae, 0xb9, 0x6c, 0x4e, 0x2c, 0xe0, 0x5b, 0x08, 0x01, 0x05, 0xd4, 0x65, 0xcf, 0x83, + 0x03, 0x60, 0xf8, 0x9a, 0xcb, 0xc8, 0x87, 0x0a, 0x1a, 0xf3, 0x49, 0x58, 0xd8, 0x32, 0x19, 0x27, + 0x41, 0x68, 0x2d, 0x96, 0x68, 0xb1, 0x32, 0x8e, 0x07, 0xaa, 0xe2, 0xe8, 0xc7, 0xec, 0x26, 0x1a, + 0x90, 0x5e, 0x99, 0x96, 0x47, 0x52, 0xa7, 0x20, 0x49, 0x6d, 0x8d, 0x24, 0x6d, 0x8f, 0x30, 0x93, + 0xb5, 0x24, 0x11, 0xe4, 0xa1, 0x82, 0xc6, 0x9b, 0x83, 0x83, 0x50, 0x55, 0xb2, 0xa6, 0x3c, 0x57, + 0xd6, 0x16, 0xd0, 0x7e, 0xff, 0x02, 0x2d, 0xeb, 0x25, 0xbd, 0xd8, 0x56, 0xae, 0x93, 0x4b, 0xe8, + 0x40, 0x8d, 0x19, 0xf0, 0x66, 0x02, 0xf5, 0xd8, 0x62, 0xa5, 0x51, 0xd9, 0xd5, 0x40, 0x87, 0x5c, + 0x81, 0x3b, 0x78, 0x83, 0x32, 0xbd, 0xc0, 0xad, 0xbd, 0x64, 0x6e, 0xb8, 0xe6, 0x9a, 0xc9, 0xb6, + 0xdb, 0xc2, 0xf5, 0xb1, 0x02, 0x37, 0x23, 0xca, 0x1e, 0x00, 0xbc, 0x8b, 0x12, 0x05, 0x6f, 0xb1, + 0x39, 0xdb, 0x17, 0x39, 0xdb, 0x41, 0x25, 0xf1, 0x77, 0x92, 0xd6, 0x22, 0x10, 0xec, 0x5b, 0x04, + 0xea, 0x04, 0xc2, 0xf6, 0xcb, 0x0d, 0x71, 0xd1, 0x48, 0xad, 0x1d, 0x70, 0xf1, 0x55, 0xf4, 0x1f, + 0xc6, 0x97, 0x73, 0x22, 0x2b, 0xbd, 0x48, 0x34, 0xf0, 0x72, 0x14, 0xbc, 0xdc, 0x2b, 0x0f, 0x0b, + 0x6f, 0x26, 0x5a, 0x1f, 0x0b, 0x8e, 0x20, 0x9f, 0x47, 0x55, 0xcd, 0xab, 0xf4, 0xfa, 0xa6, 0x6e, + 0xb7, 0x55, 0x35, 0xf5, 0xca, 0xaa, 0xc9, 0xef, 0xde, 0x45, 0xb8, 0x7b, 0xb1, 0xe9, 0x0d, 0xc2, + 0xe3, 0x9b, 0x22, 0xa1, 0x72, 0xf9, 0x87, 0x12, 0x51, 0x2e, 0x3d, 0xc8, 0xc0, 0xd8, 0xbd, 0xd6, + 0xee, 0xe0, 0x02, 0xf0, 0x35, 0x54, 0x71, 0x2c, 0x75, 0x19, 0x69, 0xf3, 0x62, 0xe2, 0x2b, 0x08, + 0x49, 0xbe, 0xa1, 0x74, 0xb6, 0x53, 0x84, 0x12, 0xd2, 0x02, 0xbf, 0xe7, 0xbf, 0x29, 0xf0, 0x52, + 0x5e, 0xb7, 0x29, 0x5b, 0x2e, 0x99, 0xab, 0x6d, 0xbd, 0xb7, 0x78, 0x01, 0x0d, 0x72, 0xe7, 0x73, + 0xba, 0xe3, 0x18, 0x2c, 0xb7, 0x66, 0x58, 0xb4, 0x08, 0xd8, 0x46, 0x83, 0x77, 0xa1, 0x5a, 0x83, + 0x68, 0xfd, 0x7c, 0x69, 0x8e, 0xaf, 0x5c, 0xe4, 0x0b, 0xf8, 0x32, 0x1a, 0xda, 0x70, 0x29, 0xab, + 0xb4, 0xb3, 0x4b, 0xd8, 0x39, 0xb4, 0x53, 0x4e, 0x8f, 0x48, 0x3b, 0x35, 0x2a, 0x44, 0x1b, 0x10, + 0x6b, 0x81, 0xa5, 0xa5, 0xae, 0xde, 0xae, 0xc1, 0x6e, 0xad, 0x6f, 0xd3, 0x64, 0xeb, 0x3c, 0x7e, + 0x8b, 0x86, 0x41, 0xae, 0x42, 0x49, 0x0b, 0x79, 0x0a, 0x41, 0x9d, 0x41, 0xc8, 0xb1, 0x29, 0xcb, + 0xd9, 0x7c, 0x15, 0x5e, 0xbf, 0x7d, 0x41, 0xd4, 0x02, 0x19, 0xd1, 0x12, 0x8e, 0xb7, 0x9b, 0xfc, + 0xa9, 0xa0, 0xc3, 0xd2, 0xe0, 0xa6, 0x6e, 0x2f, 0x6c, 0xe9, 0xab, 0xf0, 0xba, 0x65, 0x2d, 0x8f, + 0xc2, 0x63, 0xa8, 0xc7, 0x31, 0xac, 0x35, 0xa3, 0x04, 0x36, 0x87, 0x76, 0xca, 0xe9, 0x3d, 0x60, + 0x53, 0xac, 0x13, 0x0d, 0x14, 0xc2, 0x6c, 0x77, 0x36, 0x65, 0x5b, 0x45, 0x32, 0x69, 0xf9, 0x55, + 0x90, 0xec, 0xec, 0xdd, 0x29, 0xa7, 0x07, 0x42, 0x39, 0x26, 0x32, 0x7b, 0xb7, 0xf8, 0x99, 0xb5, + 0xf0, 0x4d, 0xd4, 0x53, 0xa2, 0x2e, 0x33, 0x9c, 0x91, 0x2e, 0x91, 0xb0, 0x63, 0x6a, 0xd4, 0xc4, + 0xa0, 0x72, 0x3f, 0x7c, 0x17, 0xb8, 0xfe, 0xfc, 0x3e, 0x48, 0x5f, 0x00, 0x2d, 0x8d, 0x10, 0x0d, + 0xac, 0x91, 0x0f, 0xbc, 0x3b, 0x1e, 0xc1, 0x40, 0xd0, 0x5e, 0x48, 0x40, 0xff, 0x5c, 0x7b, 0x51, + 0x6d, 0x8f, 0x68, 0xfd, 0x62, 0xc9, 0x6f, 0x2f, 0xc8, 0xdb, 0x9d, 0xd1, 0xb8, 0xae, 0xb9, 0xec, + 0x79, 0x87, 0xe6, 0x15, 0x9f, 0xea, 0x5d, 0x82, 0xea, 0xf1, 0x66, 0x54, 0x73, 0x4c, 0x31, 0xb8, + 0xe6, 0x8d, 0xab, 0xef, 0xf8, 0x48, 0x57, 0x75, 0xe3, 0xea, 0x8b, 0xbc, 0x7a, 0xc6, 0xef, 0xf6, + 0x03, 0xaf, 0x9e, 0x45, 0xd1, 0x00, 0xf1, 0xb1, 0xd1, 0x80, 0x97, 0x30, 0x95, 0xe1, 0xb9, 0xdc, + 0x72, 0x78, 0xf6, 0x57, 0xe6, 0x9f, 0x1f, 0x9d, 0x3d, 0x90, 0x86, 0x10, 0x9c, 0x43, 0x28, 0x19, + 0xbc, 0x47, 0xd5, 0xaf, 0x38, 0x79, 0xa4, 0xa0, 0xd1, 0x48, 0xf1, 0xbf, 0xe2, 0x51, 0x9e, 0xfe, + 0x1d, 0xa3, 0x6e, 0x01, 0x0f, 0xdf, 0x43, 0x62, 0xc6, 0x72, 0x70, 0x9d, 0xcb, 0x54, 0x33, 0x1b, + 0x26, 0xc7, 0x9b, 0x2b, 0x4a, 0x27, 0xc9, 0xff, 0xee, 0x7f, 0xff, 0xcb, 0x83, 0xce, 0xc3, 0x78, + 0x34, 0x13, 0x39, 0xad, 0xcb, 0xa1, 0xee, 0x5d, 0x05, 0xf5, 0x7a, 0xf3, 0x16, 0x3e, 0xde, 0xc0, + 0x76, 0xd5, 0xb0, 0x96, 0x3c, 0x11, 0x4b, 0x17, 0xa0, 0x8c, 0x09, 0x28, 0xff, 0xc5, 0xe9, 0x68, + 0x28, 0xfe, 0x04, 0x87, 0x3f, 0x51, 0x50, 0x7f, 0x65, 0xcc, 0xf0, 0xc9, 0x06, 0x07, 0x45, 0x46, + 0x3f, 0x39, 0xd5, 0xc2, 0x0e, 0x00, 0x38, 0x29, 0x00, 0x8e, 0xe1, 0xff, 0x47, 0x03, 0x94, 0x1d, + 0x8a, 0x1f, 0x40, 0xfc, 0x8e, 0x82, 0xba, 0xb8, 0x87, 0xf8, 0x68, 0x93, 0x68, 0x78, 0x90, 0xc6, + 0x9a, 0xea, 0xc5, 0x03, 0x22, 0x58, 0xca, 0xbc, 0x09, 0x05, 0xe3, 0x2e, 0x7e, 0xa8, 0xa0, 0x5e, + 0x6f, 0x3a, 0x6d, 0x18, 0xbe, 0xaa, 0x39, 0xb8, 0x61, 0xf8, 0xaa, 0xc7, 0x5d, 0x32, 0x25, 0x40, + 0x9d, 0xc0, 0xc7, 0xea, 0x83, 0x12, 0xf3, 0x6e, 0x08, 0xd8, 0x5b, 0x0a, 0xc2, 0xb5, 0x0d, 0x10, + 0x9e, 0x69, 0x70, 0x6c, 0xdd, 0x16, 0x2f, 0x79, 0xba, 0xc5, 0x5d, 0x00, 0xbb, 0x03, 0x7f, 0x55, + 0x85, 0x42, 0x76, 0x95, 0xb1, 0x51, 0x54, 0xf4, 0xcb, 0xb1, 0x51, 0x54, 0x76, 0xc7, 0xe4, 0xbc, + 0x20, 0x6f, 0x16, 0xbf, 0x10, 0x2b, 0xa2, 0x99, 0x5b, 0xd4, 0xb4, 0x72, 0xce, 0xa6, 0x6e, 0xe7, + 0x0c, 0x5e, 0x6b, 0x73, 0xa6, 0x85, 0x7f, 0x55, 0xd0, 0x68, 0x83, 0xc9, 0x0e, 0x9f, 0x69, 0x02, + 0xac, 0xf1, 0xb8, 0x9a, 0x3c, 0xdb, 0xee, 0x76, 0x70, 0xf0, 0x92, 0x70, 0x70, 0x0e, 0x9f, 0x8b, + 0xe7, 0xa0, 0xb1, 0x65, 0x32, 0xe9, 0xa0, 0x9c, 0x85, 0x65, 0x81, 0xe7, 0x7e, 0x7e, 0xa4, 0x20, + 0x14, 0x8c, 0x78, 0x78, 0xa2, 0x49, 0x8a, 0x56, 0x0c, 0x94, 0xc9, 0xc9, 0x98, 0xda, 0x00, 0x7a, + 0x46, 0x80, 0x56, 0xf1, 0x44, 0x3c, 0xd0, 0x72, 0x7e, 0xc4, 0x5f, 0x2b, 0x08, 0xd7, 0xce, 0x7a, + 0x0d, 0xf3, 0xa9, 0xee, 0xa8, 0xd9, 0x30, 0x9f, 0xea, 0x0f, 0x94, 0x64, 0x5e, 0x20, 0x7f, 0x11, + 0xcf, 0xc6, 0x43, 0x2e, 0x4b, 0x97, 0xf8, 0x0c, 0xea, 0xd7, 0xa7, 0x0a, 0xea, 0x0b, 0x4d, 0x72, + 0x78, 0xb2, 0x19, 0x94, 0xca, 0x8c, 0x51, 0xe3, 0xaa, 0x03, 0xe4, 0x59, 0x01, 0x79, 0x06, 0x4f, + 0xb7, 0x02, 0x59, 0x4e, 0x17, 0xf8, 0x91, 0x82, 0x12, 0x7e, 0xaf, 0x8d, 0x1b, 0x95, 0xad, 0xea, + 0xd9, 0x23, 0x39, 0x11, 0x4f, 0xb9, 0xcd, 0x8c, 0xe0, 0x9b, 0x1d, 0xfc, 0xad, 0x82, 0x0e, 0x2e, + 0x38, 0xcc, 0x2c, 0xea, 0xcc, 0xa8, 0xe9, 0x5f, 0xf1, 0xa9, 0x46, 0x08, 0xea, 0xf4, 0xfb, 0xc9, + 0x99, 0xd6, 0x36, 0x01, 0xfc, 0x05, 0x01, 0xff, 0x1c, 0x3e, 0x13, 0x0d, 0x3f, 0x74, 0xff, 0x00, + 0x6d, 0x26, 0x54, 0x64, 0x82, 0x3b, 0xf8, 0x9d, 0x82, 0x92, 0x75, 0xfc, 0xe1, 0x73, 0x63, 0x0b, + 0xd8, 0x82, 0x36, 0xb9, 0x61, 0xa6, 0xd7, 0xef, 0x2a, 0xc9, 0xa2, 0x70, 0xe9, 0x3c, 0x3e, 0xfb, + 0x37, 0x5c, 0xa2, 0x2e, 0x9b, 0x5f, 0x7a, 0xfc, 0x34, 0xa5, 0x3c, 0x79, 0x9a, 0x52, 0x7e, 0x7e, + 0x9a, 0x52, 0xde, 0x7b, 0x96, 0xea, 0x78, 0xf2, 0x2c, 0xd5, 0xf1, 0xc3, 0xb3, 0x54, 0xc7, 0x6b, + 0x27, 0x43, 0xdd, 0x1b, 0x9c, 0x31, 0x59, 0xd0, 0x57, 0x1c, 0xff, 0xc0, 0x3b, 0x53, 0xd3, 0x99, + 0x2d, 0x79, 0xac, 0xe8, 0xe5, 0x56, 0x7a, 0xc4, 0xff, 0x95, 0x4e, 0xfd, 0x15, 0x00, 0x00, 0xff, + 0xff, 0x51, 0x83, 0x8f, 0x15, 0x50, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -1507,9 +1507,9 @@ type QueryClient interface { // Returns "Balancer" as a string literal when the pool is a balancer pool. // Errors if the pool is failed to be type caseted. PoolType(ctx context.Context, in *QueryPoolTypeRequest, opts ...grpc.CallOption) (*QueryPoolTypeResponse, error) - // Simulates joining pool without a swap. Returns the amount of shares you'd get - // and tokens needed to provide - CalcJoinPoolNoSwap(ctx context.Context, in *QueryJoinPoolNoSwapRequest, opts ...grpc.CallOption) (*QueryJoinPoolNoSwapResponse, error) + // Simulates joining pool without a swap. Returns the amount of shares you'd + // get and tokens needed to provide + CalcJoinPoolNoSwap(ctx context.Context, in *QueryCalcJoinPoolNoSwapRequest, opts ...grpc.CallOption) (*QueryCalcJoinPoolNoSwapResponse, error) CalcJoinPoolShares(ctx context.Context, in *QueryCalcJoinPoolSharesRequest, opts ...grpc.CallOption) (*QueryCalcJoinPoolSharesResponse, error) CalcExitPoolCoinsFromShares(ctx context.Context, in *QueryCalcExitPoolCoinsFromSharesRequest, opts ...grpc.CallOption) (*QueryCalcExitPoolCoinsFromSharesResponse, error) PoolParams(ctx context.Context, in *QueryPoolParamsRequest, opts ...grpc.CallOption) (*QueryPoolParamsResponse, error) @@ -1576,8 +1576,8 @@ func (c *queryClient) PoolType(ctx context.Context, in *QueryPoolTypeRequest, op return out, nil } -func (c *queryClient) CalcJoinPoolNoSwap(ctx context.Context, in *QueryJoinPoolNoSwapRequest, opts ...grpc.CallOption) (*QueryJoinPoolNoSwapResponse, error) { - out := new(QueryJoinPoolNoSwapResponse) +func (c *queryClient) CalcJoinPoolNoSwap(ctx context.Context, in *QueryCalcJoinPoolNoSwapRequest, opts ...grpc.CallOption) (*QueryCalcJoinPoolNoSwapResponse, error) { + out := new(QueryCalcJoinPoolNoSwapResponse) err := c.cc.Invoke(ctx, "/osmosis.gamm.v1beta1.Query/CalcJoinPoolNoSwap", in, out, opts...) if err != nil { return nil, err @@ -1668,9 +1668,9 @@ type QueryServer interface { // Returns "Balancer" as a string literal when the pool is a balancer pool. // Errors if the pool is failed to be type caseted. PoolType(context.Context, *QueryPoolTypeRequest) (*QueryPoolTypeResponse, error) - // Simulates joining pool without a swap. Returns the amount of shares you'd get - // and tokens needed to provide - CalcJoinPoolNoSwap(context.Context, *QueryJoinPoolNoSwapRequest) (*QueryJoinPoolNoSwapResponse, error) + // Simulates joining pool without a swap. Returns the amount of shares you'd + // get and tokens needed to provide + CalcJoinPoolNoSwap(context.Context, *QueryCalcJoinPoolNoSwapRequest) (*QueryCalcJoinPoolNoSwapResponse, error) CalcJoinPoolShares(context.Context, *QueryCalcJoinPoolSharesRequest) (*QueryCalcJoinPoolSharesResponse, error) CalcExitPoolCoinsFromShares(context.Context, *QueryCalcExitPoolCoinsFromSharesRequest) (*QueryCalcExitPoolCoinsFromSharesResponse, error) PoolParams(context.Context, *QueryPoolParamsRequest) (*QueryPoolParamsResponse, error) @@ -1703,7 +1703,7 @@ func (*UnimplementedQueryServer) Pool(ctx context.Context, req *QueryPoolRequest func (*UnimplementedQueryServer) PoolType(ctx context.Context, req *QueryPoolTypeRequest) (*QueryPoolTypeResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method PoolType not implemented") } -func (*UnimplementedQueryServer) CalcJoinPoolNoSwap(ctx context.Context, req *QueryJoinPoolNoSwapRequest) (*QueryJoinPoolNoSwapResponse, error) { +func (*UnimplementedQueryServer) CalcJoinPoolNoSwap(ctx context.Context, req *QueryCalcJoinPoolNoSwapRequest) (*QueryCalcJoinPoolNoSwapResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method CalcJoinPoolNoSwap not implemented") } func (*UnimplementedQueryServer) CalcJoinPoolShares(ctx context.Context, req *QueryCalcJoinPoolSharesRequest) (*QueryCalcJoinPoolSharesResponse, error) { @@ -1826,7 +1826,7 @@ func _Query_PoolType_Handler(srv interface{}, ctx context.Context, dec func(inte } func _Query_CalcJoinPoolNoSwap_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryJoinPoolNoSwapRequest) + in := new(QueryCalcJoinPoolNoSwapRequest) if err := dec(in); err != nil { return nil, err } @@ -1838,7 +1838,7 @@ func _Query_CalcJoinPoolNoSwap_Handler(srv interface{}, ctx context.Context, dec FullMethod: "/osmosis.gamm.v1beta1.Query/CalcJoinPoolNoSwap", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).CalcJoinPoolNoSwap(ctx, req.(*QueryJoinPoolNoSwapRequest)) + return srv.(QueryServer).CalcJoinPoolNoSwap(ctx, req.(*QueryCalcJoinPoolNoSwapRequest)) } return interceptor(ctx, in, info, handler) } @@ -2661,7 +2661,7 @@ func (m *QueryTotalSharesResponse) MarshalToSizedBuffer(dAtA []byte) (int, error return len(dAtA) - i, nil } -func (m *QueryJoinPoolNoSwapRequest) Marshal() (dAtA []byte, err error) { +func (m *QueryCalcJoinPoolNoSwapRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2671,20 +2671,20 @@ func (m *QueryJoinPoolNoSwapRequest) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryJoinPoolNoSwapRequest) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryCalcJoinPoolNoSwapRequest) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryJoinPoolNoSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryCalcJoinPoolNoSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int _ = l { - size := m.SharesOutAmount.Size() + size := m.TokensIn.Size() i -= size - if _, err := m.SharesOutAmount.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.TokensIn.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintQuery(dAtA, i, uint64(size)) @@ -2699,7 +2699,7 @@ func (m *QueryJoinPoolNoSwapRequest) MarshalToSizedBuffer(dAtA []byte) (int, err return len(dAtA) - i, nil } -func (m *QueryJoinPoolNoSwapResponse) Marshal() (dAtA []byte, err error) { +func (m *QueryCalcJoinPoolNoSwapResponse) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) n, err := m.MarshalToSizedBuffer(dAtA[:size]) @@ -2709,12 +2709,12 @@ func (m *QueryJoinPoolNoSwapResponse) Marshal() (dAtA []byte, err error) { return dAtA[:n], nil } -func (m *QueryJoinPoolNoSwapResponse) MarshalTo(dAtA []byte) (int, error) { +func (m *QueryCalcJoinPoolNoSwapResponse) MarshalTo(dAtA []byte) (int, error) { size := m.Size() return m.MarshalToSizedBuffer(dAtA[:size]) } -func (m *QueryJoinPoolNoSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { +func (m *QueryCalcJoinPoolNoSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) { i := len(dAtA) _ = i var l int @@ -2729,10 +2729,10 @@ func (m *QueryJoinPoolNoSwapResponse) MarshalToSizedBuffer(dAtA []byte) (int, er } i-- dAtA[i] = 0x12 - if len(m.TokensIn) > 0 { - for iNdEx := len(m.TokensIn) - 1; iNdEx >= 0; iNdEx-- { + if len(m.TokensOut) > 0 { + for iNdEx := len(m.TokensOut) - 1; iNdEx >= 0; iNdEx-- { { - size, err := m.TokensIn[iNdEx].MarshalToSizedBuffer(dAtA[:i]) + size, err := m.TokensOut[iNdEx].MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -3309,7 +3309,7 @@ func (m *QueryTotalSharesResponse) Size() (n int) { return n } -func (m *QueryJoinPoolNoSwapRequest) Size() (n int) { +func (m *QueryCalcJoinPoolNoSwapRequest) Size() (n int) { if m == nil { return 0 } @@ -3318,19 +3318,19 @@ func (m *QueryJoinPoolNoSwapRequest) Size() (n int) { if m.PoolId != 0 { n += 1 + sovQuery(uint64(m.PoolId)) } - l = m.SharesOutAmount.Size() + l = m.TokensIn.Size() n += 1 + l + sovQuery(uint64(l)) return n } -func (m *QueryJoinPoolNoSwapResponse) Size() (n int) { +func (m *QueryCalcJoinPoolNoSwapResponse) Size() (n int) { if m == nil { return 0 } var l int _ = l - if len(m.TokensIn) > 0 { - for _, e := range m.TokensIn { + if len(m.TokensOut) > 0 { + for _, e := range m.TokensOut { l = e.Size() n += 1 + l + sovQuery(uint64(l)) } @@ -4976,7 +4976,7 @@ func (m *QueryTotalSharesResponse) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { +func (m *QueryCalcJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -4999,10 +4999,10 @@ func (m *QueryJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryJoinPoolNoSwapRequest: wiretype end group for non-group") + return fmt.Errorf("proto: QueryCalcJoinPoolNoSwapRequest: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryJoinPoolNoSwapRequest: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryCalcJoinPoolNoSwapRequest: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: @@ -5026,7 +5026,7 @@ func (m *QueryJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { } case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SharesOutAmount", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TokensIn", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -5054,7 +5054,7 @@ func (m *QueryJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.SharesOutAmount.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TokensIn.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -5079,7 +5079,7 @@ func (m *QueryJoinPoolNoSwapRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *QueryJoinPoolNoSwapResponse) Unmarshal(dAtA []byte) error { +func (m *QueryCalcJoinPoolNoSwapResponse) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -5102,15 +5102,15 @@ func (m *QueryJoinPoolNoSwapResponse) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: QueryJoinPoolNoSwapResponse: wiretype end group for non-group") + return fmt.Errorf("proto: QueryCalcJoinPoolNoSwapResponse: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: QueryJoinPoolNoSwapResponse: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: QueryCalcJoinPoolNoSwapResponse: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field TokensIn", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field TokensOut", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -5137,8 +5137,8 @@ func (m *QueryJoinPoolNoSwapResponse) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.TokensIn = append(m.TokensIn, types1.Coin{}) - if err := m.TokensIn[len(m.TokensIn)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + m.TokensOut = append(m.TokensOut, types1.Coin{}) + if err := m.TokensOut[len(m.TokensOut)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex