added single pool query

CHANGELOG.md

@@ -42,6 +42,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+ * [#4549](https://github.com/osmosis-labs/osmosis/pull/4549) Add single pool price estimate queries
+
 ### API Breaks
 
  * [#4489](https://github.com/osmosis-labs/osmosis/pull/4489) Add unlockingLockId to BeginUnlocking response

cmd/querygen/templates/grpcTemplate.go

@@ -10,12 +10,13 @@ type GrpcTemplate struct {
 
 type GrpcQuery struct {
 	QueryName string
+	Response  string
 }
 
 func GrpcTemplateFromQueryYml(queryYml QueryYml) GrpcTemplate {
 	GrpcQueries := []GrpcQuery{}
 	for queryName := range queryYml.Queries {
-		GrpcQueries = append(GrpcQueries, GrpcQuery{QueryName: queryName})
+		GrpcQueries = append(GrpcQueries, GrpcQuery{QueryName: queryName, Response: queryYml.Queries[queryName].ProtoWrapper.Response})
 	}
 	sort.Slice(GrpcQueries, func(i, j int) bool {
 		return GrpcQueries[i].QueryName > GrpcQueries[j].QueryName

cmd/querygen/templates/grpc_template.tmpl

@@ -24,7 +24,7 @@ var _ queryproto.QueryServer = Querier{}
 
 func (q Querier) {{.QueryName}}(grpcCtx context.Context,
 	req *queryproto.{{.QueryName}}Request,
-) (*queryproto.{{.QueryName}}Response, error) {
+) ({{ if .Response }}{{.Response}}{{else}}*queryproto.{{.QueryName}}Response{{end}}, error) {
 	if req == nil {
 		return nil, status.Error(codes.InvalidArgument, "empty request")
 	}

cmd/querygen/templates/queryyml.go

@@ -33,7 +33,7 @@ type YmlQueryDescriptor struct {
 type ProtoWrapperDescriptor struct {
 	DefaultValues map[string]string `yaml:"default_values"`
 	QueryFunc     string            `yaml:"query_func"`
-	Response      string
+	Response      string            `yaml:"response"`
 }
 
 type CliDescriptor struct{}

proto/osmosis/poolmanager/v1beta1/query.proto

@@ -24,14 +24,28 @@ service Query {
   rpc EstimateSwapExactAmountIn(EstimateSwapExactAmountInRequest)
       returns (EstimateSwapExactAmountInResponse) {
     option (google.api.http).get =
-        "/osmosis/gamm/v1beta1/{pool_id}/estimate/swap_exact_amount_in";
+        "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/swap_exact_amount_in";
+  }
+
+  rpc EstimateSinglePoolSwapExactAmountIn(
+      EstimateSinglePoolSwapExactAmountInRequest)
+      returns (EstimateSwapExactAmountInResponse) {
+    option (google.api.http).get = "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/"
+                                   "single_pool_swap_exact_amount_in";
   }
 
   // Estimates swap amount in given out.
   rpc EstimateSwapExactAmountOut(EstimateSwapExactAmountOutRequest)
       returns (EstimateSwapExactAmountOutResponse) {
     option (google.api.http).get =
-        "/osmosis/gamm/v1beta1/{pool_id}/estimate/swap_exact_amount_out";
+        "/osmosis/poolmanager/v1beta1/{pool_id}/estimate/swap_exact_amount_out";
+  }
+
+  rpc EstimateSinglePoolSwapExactAmountOut(
+      EstimateSinglePoolSwapExactAmountOutRequest)
+      returns (EstimateSwapExactAmountOutResponse) {
+    option (google.api.http).get = "/osmosis/poolmanager/v1beta1/{pool_id}/estimate_out/"
+                                   "single_pool_swap_exact_amount_out";
   }
 
   rpc NumPools(NumPoolsRequest) returns (NumPoolsResponse) {
@@ -45,8 +59,8 @@ message ParamsResponse { Params params = 1 [ (gogoproto.nullable) = false ]; }
 
 //=============================== EstimateSwapExactAmountIn
 message EstimateSwapExactAmountInRequest {
-  // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
-  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  reserved 1;
+  reserved "sender";
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string token_in = 3 [ (gogoproto.moretags) = "yaml:\"token_in\"" ];
   repeated SwapAmountInRoute routes = 4 [
@@ -55,6 +69,13 @@ message EstimateSwapExactAmountInRequest {
   ];
 }
 
+message EstimateSinglePoolSwapExactAmountInRequest {
+  uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
+  string token_in = 2 [ (gogoproto.moretags) = "yaml:\"token_in\"" ];
+  string token_out_denom = 3
+      [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ];
+}
+
 message EstimateSwapExactAmountInResponse {
   string token_out_amount = 1 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",
@@ -65,8 +86,8 @@ message EstimateSwapExactAmountInResponse {
 
 //=============================== EstimateSwapExactAmountOut
 message EstimateSwapExactAmountOutRequest {
-  // TODO: CHANGE THIS TO RESERVED IN A PATCH RELEASE
-  string sender = 1 [ (gogoproto.moretags) = "yaml:\"sender\"" ];
+  reserved 1;
+  reserved "sender";
   uint64 pool_id = 2 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   repeated SwapAmountOutRoute routes = 3 [
     (gogoproto.moretags) = "yaml:\"routes\"",
@@ -75,6 +96,13 @@ message EstimateSwapExactAmountOutRequest {
   string token_out = 4 [ (gogoproto.moretags) = "yaml:\"token_out\"" ];
 }
 
+message EstimateSinglePoolSwapExactAmountOutRequest {
+  uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
+  string token_in_denom = 2
+      [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ];
+  string token_out = 3 [ (gogoproto.moretags) = "yaml:\"token_out\"" ];
+}
+
 message EstimateSwapExactAmountOutResponse {
   string token_in_amount = 1 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Int",

proto/osmosis/poolmanager/v1beta1/query.yml

@@ -18,6 +18,18 @@ queries:
       query_func: "k.EstimateSwapExactAmountOut"
     cli:
       cmd: "EstimateSwapExactAmountOut"
+  EstimateSinglePoolSwapExactAmountIn:
+    proto_wrapper:
+      query_func: "k.EstimateSinglePoolSwapExactAmountIn"
+      response: "*queryproto.EstimateSwapExactAmountInResponse"
+    cli:
+      cmd: "EstimateSinglePoolSwapExactAmountIn"
+  EstimateSinglePoolSwapExactAmountOut:
+    proto_wrapper:
+      query_func: "k.EstimateSinglePoolSwapExactAmountOutTEST"
+      response: "*queryproto.EstimateSwapExactAmountOutResponse"
+    cli:
+      cmd: "EstimateSinglePoolSwapExactAmountOut"
   NumPools:
     proto_wrapper:
       query_func: "k.NumPools"

proto/osmosis/poolmanager/v1beta1/swap_route.proto

@@ -14,5 +14,5 @@ message SwapAmountInRoute {
 message SwapAmountOutRoute {
   uint64 pool_id = 1 [ (gogoproto.moretags) = "yaml:\"pool_id\"" ];
   string token_in_denom = 2
-      [ (gogoproto.moretags) = "yaml:\"token_out_denom\"" ];
+      [ (gogoproto.moretags) = "yaml:\"token_in_denom\"" ];
 }

x/poolmanager/client/cli/cli_test.go

@@ -201,7 +201,6 @@ func TestGetCmdEstimateSwapExactAmountIn(t *testing.T) {
 		"basic test": {
 			Cmd: "1 osm11vmx8jtggpd9u7qr0t8vxclycz85u925sazglr7 10stake --swap-route-pool-ids=2 --swap-route-denoms=node0token",
 			ExpectedQuery: &queryproto.EstimateSwapExactAmountInRequest{
-				Sender:  "osm11vmx8jtggpd9u7qr0t8vxclycz85u925sazglr7",
 				PoolId:  1,
 				TokenIn: "10stake",
 				Routes:  []types.SwapAmountInRoute{{PoolId: 2, TokenOutDenom: "node0token"}},
@@ -216,7 +215,6 @@ func TestGetCmdEstimateSwapExactAmountOut(t *testing.T) {
 		"basic test": {
 			Cmd: "1 osm11vmx8jtggpd9u7qr0t8vxclycz85u925sazglr7 10stake --swap-route-pool-ids=2 --swap-route-denoms=node0token",
 			ExpectedQuery: &queryproto.EstimateSwapExactAmountOutRequest{
-				Sender:   "osm11vmx8jtggpd9u7qr0t8vxclycz85u925sazglr7",
 				PoolId:   1,
 				TokenOut: "10stake",
 				Routes:   []types.SwapAmountOutRoute{{PoolId: 2, TokenInDenom: "node0token"}},

x/poolmanager/client/cli/query.go

@@ -76,7 +76,6 @@ func EstimateSwapExactAmountInParseArgs(args []string, fs *flag.FlagSet) (proto.
 	}
 
 	return &queryproto.EstimateSwapExactAmountInRequest{
-		Sender:  args[1],        // TODO: where sender is used?
 		PoolId:  uint64(poolID), // TODO: is this poolId used?
 		TokenIn: args[2],
 		Routes:  routes,
@@ -95,7 +94,6 @@ func EstimateSwapExactAmountOutParseArgs(args []string, fs *flag.FlagSet) (proto
 	}
 
 	return &queryproto.EstimateSwapExactAmountOutRequest{
-		Sender:   args[1],        // TODO: where sender is used?
 		PoolId:   uint64(poolID), // TODO: is this poolId used?
 		Routes:   routes,
 		TokenOut: args[2],

x/poolmanager/client/cli/query_test.go

@@ -2,6 +2,7 @@ package cli_test
 
 import (
 	gocontext "context"
+	"github.com/osmosis-labs/osmosis/v15/x/poolmanager/types"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -39,13 +40,21 @@ func (s *QueryTestSuite) TestQueriesNeverAlterState() {
 		{
 			"Query estimate swap in",
 			"/osmosis.poolmanager.v1beta1.Query/EstimateSwapExactAmountIn",
-			&poolmanagerqueryproto.EstimateSwapExactAmountInRequest{},
+			&poolmanagerqueryproto.EstimateSwapExactAmountInRequest{
+				PoolId:  1,
+				TokenIn: "10bar",
+				Routes:  types.SwapAmountInRoutes{{PoolId: 1, TokenOutDenom: "baz"}},
+			},
 			&poolmanagerqueryproto.EstimateSwapExactAmountInResponse{},
 		},
 		{
 			"Query estimate swap out",
 			"/osmosis.poolmanager.v1beta1.Query/EstimateSwapExactAmountOut",
-			&poolmanagerqueryproto.EstimateSwapExactAmountOutRequest{},
+			&poolmanagerqueryproto.EstimateSwapExactAmountOutRequest{
+				PoolId:   1,
+				TokenOut: "6baz",
+				Routes:   types.SwapAmountOutRoutes{{PoolId: 1, TokenInDenom: "bar"}},
+			},
 			&poolmanagerqueryproto.EstimateSwapExactAmountOutResponse{},
 		},
 	}
@@ -61,10 +70,49 @@ func (s *QueryTestSuite) TestQueriesNeverAlterState() {
 	}
 }
 
-func TestQueryTestSuite(t *testing.T) {
+func (s *QueryTestSuite) TestSimplifiedQueries() {
+	swapIn := &poolmanagerqueryproto.EstimateSwapExactAmountInRequest{
+		PoolId:  1,
+		TokenIn: "10bar",
+		Routes:  types.SwapAmountInRoutes{{PoolId: 1, TokenOutDenom: "baz"}},
+	}
+	swapOut := &poolmanagerqueryproto.EstimateSwapExactAmountOutRequest{
+		PoolId:   1,
+		TokenOut: "6baz",
+		Routes:   types.SwapAmountOutRoutes{{PoolId: 1, TokenInDenom: "bar"}},
+	}
+	simplifiedSwapIn := &poolmanagerqueryproto.EstimateSinglePoolSwapExactAmountInRequest{
+		PoolId:        1,
+		TokenIn:       "10bar",
+		TokenOutDenom: "baz",
+	}
+	simplifiedSwapOut := &poolmanagerqueryproto.EstimateSinglePoolSwapExactAmountOutRequest{
+		PoolId:       1,
+		TokenOut:     "6baz",
+		TokenInDenom: "bar",
+	}
+	s.SetupSuite()
+	output1 := &poolmanagerqueryproto.EstimateSwapExactAmountInResponse{}
+	output2 := &poolmanagerqueryproto.EstimateSwapExactAmountInResponse{}
+	err := s.QueryHelper.Invoke(gocontext.Background(),
+		"/osmosis.poolmanager.v1beta1.Query/EstimateSwapExactAmountIn", swapIn, output1)
+	s.Require().NoError(err)
+	err = s.QueryHelper.Invoke(gocontext.Background(),
+		"/osmosis.poolmanager.v1beta1.Query/EstimateSinglePoolSwapExactAmountIn", simplifiedSwapIn, output2)
+	s.Require().NoError(err)
+	s.Require().Equal(output1, output2)
 
-	// TODO: re-enable this once poolmanager is fully merged.
-	t.SkipNow()
+	output3 := &poolmanagerqueryproto.EstimateSwapExactAmountOutResponse{}
+	output4 := &poolmanagerqueryproto.EstimateSwapExactAmountOutResponse{}
+	err = s.QueryHelper.Invoke(gocontext.Background(),
+		"/osmosis.poolmanager.v1beta1.Query/EstimateSwapExactAmountOut", swapOut, output3)
+	s.Require().NoError(err)
+	err = s.QueryHelper.Invoke(gocontext.Background(),
+		"/osmosis.poolmanager.v1beta1.Query/EstimateSinglePoolSwapExactAmountOut", simplifiedSwapOut, output4)
+	s.Require().NoError(err)
+	s.Require().Equal(output3, output4)
+}
 
+func TestQueryTestSuite(t *testing.T) {
 	suite.Run(t, new(QueryTestSuite))
 }

x/poolmanager/client/grpc/grpc_query.go

@@ -60,3 +60,23 @@ func (q Querier) EstimateSwapExactAmountIn(grpcCtx context.Context,
 	return q.Q.EstimateSwapExactAmountIn(ctx, *req)
 }
 
+func (q Querier) EstimateSinglePoolSwapExactAmountOut(grpcCtx context.Context,
+	req *queryproto.EstimateSinglePoolSwapExactAmountOutRequest,
+) (*queryproto.EstimateSwapExactAmountOutResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.EstimateSinglePoolSwapExactAmountOut(ctx, *req)
+}
+
+func (q Querier) EstimateSinglePoolSwapExactAmountIn(grpcCtx context.Context,
+	req *queryproto.EstimateSinglePoolSwapExactAmountInRequest,
+) (*queryproto.EstimateSwapExactAmountInResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "empty request")
+	}
+	ctx := sdk.UnwrapSDKContext(grpcCtx)
+	return q.Q.EstimateSinglePoolSwapExactAmountIn(ctx, *req)
+}
+

x/poolmanager/client/query_proto_wrap.go

@@ -50,10 +50,6 @@ func (q Querier) EstimateSwapExactAmountIn(ctx sdk.Context, req queryproto.Estim
 
 // EstimateSwapExactAmountOut estimates token output amount for a swap.
 func (q Querier) EstimateSwapExactAmountOut(ctx sdk.Context, req queryproto.EstimateSwapExactAmountOutRequest) (*queryproto.EstimateSwapExactAmountOutResponse, error) {
-	if req.Sender == "" {
-		return nil, status.Error(codes.InvalidArgument, "address cannot be empty")
-	}
-
 	if req.TokenOut == "" {
 		return nil, status.Error(codes.InvalidArgument, "invalid token")
 	}
@@ -83,3 +79,21 @@ func (q Querier) NumPools(ctx sdk.Context, _ queryproto.NumPoolsRequest) (*query
 		NumPools: q.K.GetNextPoolId(ctx) - 1,
 	}, nil
 }
+
+func (q Querier) EstimateSinglePoolSwapExactAmountOut(ctx sdk.Context, req queryproto.EstimateSinglePoolSwapExactAmountOutRequest) (*queryproto.EstimateSwapExactAmountOutResponse, error) {
+	routeReq := &queryproto.EstimateSwapExactAmountOutRequest{
+		PoolId:   req.PoolId,
+		TokenOut: req.TokenOut,
+		Routes:   types.SwapAmountOutRoutes{{PoolId: req.PoolId, TokenInDenom: req.TokenInDenom}},
+	}
+	return q.EstimateSwapExactAmountOut(ctx, *routeReq)
+}
+
+func (q Querier) EstimateSinglePoolSwapExactAmountIn(ctx sdk.Context, req queryproto.EstimateSinglePoolSwapExactAmountInRequest) (*queryproto.EstimateSwapExactAmountInResponse, error) {
+	routeReq := &queryproto.EstimateSwapExactAmountInRequest{
+		PoolId:  req.PoolId,
+		TokenIn: req.TokenIn,
+		Routes:  types.SwapAmountInRoutes{{PoolId: req.PoolId, TokenOutDenom: req.TokenOutDenom}},
+	}
+	return q.EstimateSwapExactAmountIn(ctx, *routeReq)
+}