Paginate user deposits & user LOs

app/app.go

@@ -578,9 +578,8 @@ func NewApp(
 		// "/dualitylabs.duality.dex.Query/LimitOrderTrancheUserAll": &dexmoduletypes.QueryAllLimitOrderTrancheUserResponse{},
 		"/dualitylabs.duality.dex.Query/LimitOrderTranche": &dexmoduletypes.QueryGetLimitOrderTrancheResponse{},
 		// "/dualitylabs.duality.dex.Query/LimitOrderTrancheAll":     &dexmoduletypes.QueryAllLimitOrderTrancheResponse{},
-		"/dualitylabs.duality.dex.Query/GetUserPositions": &dexmoduletypes.QueryGetUserPositionsResponse{},
-		// "/dualitylabs.duality.dex.Query/UserDepositsAll":              &dexmoduletypes.QueryAllUserDepositsResponse{},
-		// "/dualitylabs.duality.dex.Query/UserLimitOrdersAll":           &dexmoduletypes.QueryAllUserLimitOrdersResponse{},
+		"/dualitylabs.duality.dex.Query/UserDepositsAll":    &dexmoduletypes.QueryAllUserDepositsResponse{},
+		"/dualitylabs.duality.dex.Query/UserLimitOrdersAll": &dexmoduletypes.QueryAllUserLimitOrdersResponse{},
 		// "/dualitylabs.duality.dex.Query/TickLiquidityAll":             &dexmoduletypes.QueryAllTickLiquidityResponse{},
 		"/dualitylabs.duality.dex.Query/InactiveLimitOrderTranche": &dexmoduletypes.QueryGetInactiveLimitOrderTrancheResponse{},
 		// "/dualitylabs.duality.dex.Query/InactiveLimitOrderTrancheAll": &dexmoduletypes.QueryAllInactiveLimitOrderTrancheResponse{},

proto/duality/dex/query.proto

@@ -8,7 +8,6 @@ import "cosmos/base/query/v1beta1/pagination.proto";
 import "duality/dex/params.proto";
 import "duality/dex/limit_order_tranche_user.proto";
 import "duality/dex/limit_order_tranche.proto";
-import "duality/dex/user_positions.proto";
 import "duality/dex/deposit_record.proto";
 import "duality/dex/tick_liquidity.proto";
 import "duality/dex/pool_reserves.proto";
@@ -41,77 +40,60 @@ service Query {
     option (google.api.http).get = "/duality/dex/limit_order_tranche_user";
 
   }
+
+  // Queries a list of LimitOrderTrancheUser items for a given address.
+	rpc LimitOrderTrancheUserAllByAddress(QueryAllUserLimitOrdersRequest) returns (QueryAllUserLimitOrdersResponse) {
+		option (google.api.http).get = "/duality/dex/user/limit_orders/{address}";
+	}
 
   // Queries a LimitOrderTranche by index.
   rpc LimitOrderTranche (QueryGetLimitOrderTrancheRequest) returns (QueryGetLimitOrderTrancheResponse) {
     option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}";
-
   }
 
   // Queries a list of LimitOrderTranche items for a given pairID / TokenIn combination.
   rpc LimitOrderTrancheAll (QueryAllLimitOrderTrancheRequest) returns (QueryAllLimitOrderTrancheResponse) {
     option (google.api.http).get = "/duality/dex/limit_order_tranche/{pairID}/{tokenIn}";
-
-  }
-
-  // Queries a list of GetUserPositions items.
-  rpc GetUserPositions (QueryGetUserPositionsRequest) returns (QueryGetUserPositionsResponse) {
-    option (google.api.http).get = "/duality/dex/user/positions/{address}";
-
   }
 
   // Queries a list of UserDeposits items.
   rpc UserDepositsAll (QueryAllUserDepositsRequest) returns (QueryAllUserDepositsResponse) {
     option (google.api.http).get = "/duality/dex/user/deposits/{address}";
-
-  }
-
-  // Queries a list of UserLimitOrders items.
-  rpc UserLimitOrdersAll (QueryAllUserLimitOrdersRequest) returns (QueryAllUserLimitOrdersResponse) {
-    option (google.api.http).get = "/duality/dex/user/limit_orders/{address}";
-
   }
 
   // Queries a list of TickLiquidity items.
   rpc TickLiquidityAll (QueryAllTickLiquidityRequest) returns (QueryAllTickLiquidityResponse) {
     option (google.api.http).get = "/duality/dex/tick_liquidity/{pairID}/{tokenIn}";
-
   }
 
   // Queries a InactiveLimitOrderTranche by index.
   rpc InactiveLimitOrderTranche (QueryGetInactiveLimitOrderTrancheRequest) returns (QueryGetInactiveLimitOrderTrancheResponse) {
     option (google.api.http).get = "/duality/dex/filled_limit_order_tranche/{pairID}/{tokenIn}/{tickIndex}/{trancheKey}";
-
   }
 
   // Queries a list of InactiveLimitOrderTranche items.
   rpc InactiveLimitOrderTrancheAll (QueryAllInactiveLimitOrderTrancheRequest) returns (QueryAllInactiveLimitOrderTrancheResponse) {
     option (google.api.http).get = "/duality/dex/filled_limit_order_tranche";
-
   }
 
   // Queries a list of PoolReserves items.
   rpc PoolReservesAll (QueryAllPoolReservesRequest) returns (QueryAllPoolReservesResponse) {
     option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}";
-
   }
 
   // Queries a PoolReserve by index
   rpc PoolReserves (QueryGetPoolReservesRequest) returns (QueryGetPoolReservesResponse) {
     option (google.api.http).get = "/duality/dex/pool_reserves/{pairID}/{tokenIn}/{tickIndex}/{fee}";
-
   }
 
   // Queries the simulated result of a multihop swap 
   rpc EstimateMultiHopSwap (QueryEstimateMultiHopSwapRequest) returns (QueryEstimateMultiHopSwapResponse) {
     option (google.api.http).get = "/duality/dex/estimate_multi_hop_swap";
-
   }
 
   // Queries the simulated result of a multihop swap 
   rpc EstimatePlaceLimitOrder (QueryEstimatePlaceLimitOrderRequest) returns (QueryEstimatePlaceLimitOrderResponse) {
     option (google.api.http).get = "/duality/dex/estimate_place_limit_order";
-
   }
 
   // Queries a pool by pair, tick and fee
@@ -191,28 +173,24 @@ message QueryAllLimitOrderTrancheResponse {
            cosmos.base.query.v1beta1.PageResponse pagination        = 2;
 }
 
-message QueryGetUserPositionsRequest {
-  string address = 1;
-}
-
-message QueryGetUserPositionsResponse {
-  UserPositions UserPositions = 1 [(gogoproto.nullable) = true];
-}
-
 message QueryAllUserDepositsRequest {
   string address = 1;
+	cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 message QueryAllUserDepositsResponse {
   repeated DepositRecord Deposits = 1 [(gogoproto.nullable) = true];
+	cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
 message QueryAllUserLimitOrdersRequest {
   string address = 1;
+	cosmos.base.query.v1beta1.PageRequest pagination = 2;
 }
 
 message QueryAllUserLimitOrdersResponse {
   repeated LimitOrderTrancheUser limitOrders = 1 [(gogoproto.nullable) = true];
+  cosmos.base.query.v1beta1.PageResponse pagination = 2;
 }
 
 message QueryAllTickLiquidityRequest {

utils/bank.go

@@ -0,0 +1,110 @@
+package utils
+
+import (
+	"fmt"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/duality-labs/duality/x/dex/types"
+
+	"github.com/cosmos/cosmos-sdk/types/query"
+)
+
+func FilteredPaginateAccountBalances(
+	ctx sdk.Context,
+	bankKeeper types.BankKeeper,
+	address sdk.AccAddress,
+	pageRequest *query.PageRequest,
+	onResult func(coin sdk.Coin, accumulate bool) bool,
+) (*query.PageResponse, error) {
+	// if the PageRequest is nil, use default PageRequest
+	if pageRequest == nil {
+		pageRequest = &query.PageRequest{}
+	}
+
+	offset := pageRequest.Offset
+	key := pageRequest.Key
+	limit := pageRequest.Limit
+	countTotal := pageRequest.CountTotal
+
+	if pageRequest.Reverse {
+		return nil, fmt.Errorf("invalid request, reverse pagination is not enabled")
+	}
+	if offset > 0 && key != nil {
+		return nil, fmt.Errorf("invalid request, either offset or key is expected, got both")
+	}
+
+	if limit == 0 {
+		limit = query.DefaultLimit
+
+		// count total results when the limit is zero/not supplied
+		countTotal = true
+	}
+
+	if len(key) != 0 {
+		// paginate with key
+		var (
+			numHits uint64
+			nextKey []byte
+		)
+		startAccum := false
+
+		bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool {
+			if coin.Denom == string(key) {
+				startAccum = true
+			}
+			if numHits == limit {
+				nextKey = []byte(coin.Denom)
+				return true
+			}
+			if startAccum {
+				hit := onResult(coin, true)
+				if hit {
+					numHits++
+				}
+			}
+
+			return false
+		})
+
+		return &query.PageResponse{
+			NextKey: nextKey,
+		}, nil
+	} else {
+		// default pagination (with offset)
+
+		end := offset + limit
+
+		var (
+			numHits uint64
+			nextKey []byte
+		)
+
+		bankKeeper.IterateAccountBalances(ctx, address, func(coin sdk.Coin) bool {
+			accumulate := numHits >= offset && numHits < end
+			hit := onResult(coin, accumulate)
+
+			if hit {
+				numHits++
+			}
+
+			if numHits == end+1 {
+				if nextKey == nil {
+					nextKey = []byte(coin.Denom)
+				}
+
+				if !countTotal {
+					return true
+				}
+			}
+
+			return false
+		})
+
+		res := &query.PageResponse{NextKey: nextKey}
+		if countTotal {
+			res.Total = numHits
+		}
+
+		return res, nil
+	}
+}

x/dex/client/cli/query.go

@@ -32,7 +32,6 @@ func GetQueryCmd(_ string) *cobra.Command {
 	cmd.AddCommand(CmdShowLimitOrderTrancheUser())
 	cmd.AddCommand(CmdListLimitOrderTranche())
 	cmd.AddCommand(CmdShowLimitOrderTranche())
-	cmd.AddCommand(CmdShowUserPositions())
 	cmd.AddCommand(CmdListUserDeposits())
 	cmd.AddCommand(CmdListUserLimitOrders())
 	cmd.AddCommand(CmdListTickLiquidity())

x/dex/client/cli/query_user_deposits.go

@@ -37,6 +37,7 @@ func CmdListUserDeposits() *cobra.Command {
 	}
 
 	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, cmd.Use)
 
 	return cmd
 }

x/dex/client/cli/query_user_limit_orders.go

@@ -27,7 +27,7 @@ func CmdListUserLimitOrders() *cobra.Command {
 				Address: reqAddress,
 			}
 
-			res, err := queryClient.UserLimitOrdersAll(cmd.Context(), params)
+			res, err := queryClient.LimitOrderTrancheUserAllByAddress(cmd.Context(), params)
 			if err != nil {
 				return err
 			}
@@ -37,6 +37,7 @@ func CmdListUserLimitOrders() *cobra.Command {
 	}
 
 	flags.AddQueryFlagsToCmd(cmd)
+	flags.AddPaginationFlagsToCmd(cmd, cmd.Use)
 
 	return cmd
 }

x/dex/keeper/grpc_query_limit_order_tranche_user.go

@@ -63,3 +63,40 @@ func (k Keeper) LimitOrderTrancheUser(c context.Context,
 
 	return &types.QueryGetLimitOrderTrancheUserResponse{LimitOrderTrancheUser: val}, nil
 }
+
+func (k Keeper) LimitOrderTrancheUserAllByAddress(
+	goCtx context.Context,
+	req *types.QueryAllUserLimitOrdersRequest,
+) (*types.QueryAllUserLimitOrdersResponse, error) {
+	if req == nil {
+		return nil, status.Error(codes.InvalidArgument, "invalid request")
+	}
+
+	addr, err := sdk.AccAddressFromBech32(req.Address)
+	if err != nil {
+		return nil, err
+	}
+	ctx := sdk.UnwrapSDKContext(goCtx)
+	var limitOrderTrancheUserList []*types.LimitOrderTrancheUser
+	addressPrefix := types.LimitOrderTrancheUserAddressPrefix(addr.String())
+	store := prefix.NewStore(ctx.KVStore(k.storeKey), addressPrefix)
+
+	pageRes, err := query.Paginate(store, req.Pagination, func(key, value []byte) error {
+		trancheUser := &types.LimitOrderTrancheUser{}
+		if err := k.cdc.Unmarshal(value, trancheUser); err != nil {
+			return err
+		}
+
+		limitOrderTrancheUserList = append(limitOrderTrancheUserList, trancheUser)
+
+		return nil
+	})
+	if err != nil {
+		return nil, status.Error(codes.Internal, err.Error())
+	}
+
+	return &types.QueryAllUserLimitOrdersResponse{
+		LimitOrders: limitOrderTrancheUserList,
+		Pagination:  pageRes,
+	}, nil
+}