Bring back pool id for single swaps

osmosis-labs · Oct 13, 2023 · 600209d · 600209d
1 parent 42e0785
commit 600209d
Show file tree

Hide file tree

Showing 3 changed files with 107 additions and 109 deletions.
diff --git a/proto/osmosis/poolmanager/v1beta1/query.proto b/proto/osmosis/poolmanager/v1beta1/query.proto
@@ -141,7 +141,7 @@ message EstimateSwapExactAmountInWithPrimitiveTypesRequest {
 
 message EstimateSinglePoolSwapExactAmountInRequest {
   uint64 pool_id = 1
-      [ (gogoproto.moretags) = "yaml:\"pool_id\"", deprecated = true ];
+      [ (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\"" ];
@@ -181,7 +181,7 @@ message EstimateSwapExactAmountOutWithPrimitiveTypesRequest {
 
 message EstimateSinglePoolSwapExactAmountOutRequest {
   uint64 pool_id = 1
-      [ (gogoproto.moretags) = "yaml:\"pool_id\"", deprecated = true ];
+      [ (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\"" ];

diff --git a/x/poolmanager/client/query_proto_wrap.go b/x/poolmanager/client/query_proto_wrap.go
@@ -143,15 +143,15 @@ func (q Querier) EstimateSwapExactAmountOutWithPrimitiveTypes(ctx sdk.Context, r
 func (q Querier) EstimateSinglePoolSwapExactAmountOut(ctx sdk.Context, req queryproto.EstimateSinglePoolSwapExactAmountOutRequest) (*queryproto.EstimateSwapExactAmountOutResponse, error) {
 	routeReq := &queryproto.EstimateSwapExactAmountOutRequest{
 		TokenOut: req.TokenOut,
-		Routes:   types.SwapAmountOutRoutes{{TokenInDenom: req.TokenInDenom}},
+		Routes:   types.SwapAmountOutRoutes{{TokenInDenom: req.TokenInDenom, PoolId: req.PoolId}},
 	}
 	return q.EstimateSwapExactAmountOut(ctx, *routeReq)
 }
 
 func (q Querier) EstimateSinglePoolSwapExactAmountIn(ctx sdk.Context, req queryproto.EstimateSinglePoolSwapExactAmountInRequest) (*queryproto.EstimateSwapExactAmountInResponse, error) {
 	routeReq := &queryproto.EstimateSwapExactAmountInRequest{
 		TokenIn: req.TokenIn,
-		Routes:  types.SwapAmountInRoutes{{TokenOutDenom: req.TokenOutDenom}},
+		Routes:  types.SwapAmountInRoutes{{TokenOutDenom: req.TokenOutDenom, PoolId: req.PoolId}},
 	}
 	return q.EstimateSwapExactAmountIn(ctx, *routeReq)
 }