Skip to content

fix: fix pagination key handling and Base64 decoding #2002

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Zblocker64 wants to merge 7 commits into from
Closed

fix: fix pagination key handling and Base64 decoding #2002

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e8b99de
fix: fix pagination key handling and Base64 decoding
Zblocker64 Sep 11, 2025
30092df
Merge branch 'main' into pagination-fix
Zblocker64 Sep 11, 2025
426eb82
chore: fix linter error
Zblocker64 Sep 11, 2025
ff9500e
fix(x/market): improve pagination key handling per CodeRabbit review
Zblocker64 Sep 11, 2025
efd7c85
chore: fix linter error
Zblocker64 Sep 11, 2025
fa46bbe
fix(x/market): apply pagination fixes to all query handlers
Zblocker64 Sep 11, 2025
595cf81
chore: fix lint
Zblocker64 Sep 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 47 additions & 23 deletions x/market/keeper/grpc_query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ package keeper

import (
"context"
"encoding/base64"
"errors"

"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
Expand Down Expand Up @@ -48,25 +50,37 @@ func (k Querier) Orders(c context.Context, req *types.QueryOrdersRequest) (*type
var searchPrefix []byte

// setup for case 3 - cross-index search
// nolint: gocritic
if len(req.Pagination.Key) > 0 {
hasPaginationKey := len(req.Pagination.Key) > 0
switch {
case hasPaginationKey:
var key []byte
var err error
states, searchPrefix, key, _, err = query.DecodePaginationKey(req.Pagination.Key)

// Accept both raw and base64-encoded keys: try raw first, then base64.
paginationKeyBytes := req.Pagination.Key
states, searchPrefix, key, _, err = query.DecodePaginationKey(paginationKeyBytes)
if err != nil {
if decoded, decErr := base64.StdEncoding.DecodeString(string(req.Pagination.Key)); decErr == nil {
states, searchPrefix, key, _, err = query.DecodePaginationKey(decoded)
}
}
if err != nil {
if errors.Is(err, query.ErrInvalidPaginationKey) {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
return nil, status.Error(codes.Internal, err.Error())
}

req.Pagination.Key = key
} else if req.Filters.State != "" {
case req.Filters.State != "":
stateVal := types.Order_State(types.Order_State_value[req.Filters.State])

if req.Filters.State != "" && stateVal == types.OrderStateInvalid {
return nil, status.Error(codes.InvalidArgument, "invalid state value")
}

states = append(states, byte(stateVal))
} else {
default:
// request does not have pagination set. Start from open store
states = append(states, byte(types.OrderOpen))
states = append(states, byte(types.OrderActive))
Expand All @@ -84,7 +98,7 @@ func (k Querier) Orders(c context.Context, req *types.QueryOrdersRequest) (*type
state := types.Order_State(states[idx])
var err error

if idx > 0 {
if idx > 0 && !hasPaginationKey {
req.Pagination.Key = nil
}

Expand Down Expand Up @@ -125,13 +139,7 @@ func (k Querier) Orders(c context.Context, req *types.QueryOrdersRequest) (*type
return nil, status.Error(codes.Internal, err.Error())
}

if len(pageRes.NextKey) > 0 {
nextKey := make([]byte, len(searchPrefix)+len(pageRes.NextKey))
copy(nextKey, searchPrefix)
copy(nextKey[len(searchPrefix):], pageRes.NextKey)

pageRes.NextKey = nextKey
}
// Keep raw Cosmos SDK nextKey; do not prepend searchPrefix

req.Pagination.Limit -= count
total += count
Expand Down Expand Up @@ -186,8 +194,19 @@ func (k Querier) Bids(c context.Context, req *types.QueryBidsRequest) (*types.Qu
var key []byte
var unsolicited []byte
var err error
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(req.Pagination.Key)

// Accept both raw and base64-encoded keys: try raw first, then base64.
paginationKeyBytes := req.Pagination.Key
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(paginationKeyBytes)
if err != nil {
if decoded, decErr := base64.StdEncoding.DecodeString(string(req.Pagination.Key)); decErr == nil {
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(decoded)
}
}
if err != nil {
if errors.Is(err, query.ErrInvalidPaginationKey) {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
return nil, status.Error(codes.Internal, err.Error())
}

Expand All @@ -196,7 +215,7 @@ func (k Querier) Bids(c context.Context, req *types.QueryBidsRequest) (*types.Qu
}
req.Pagination.Key = key

if unsolicited[1] == 1 {
if unsolicited[0] == 1 {
reverseSearch = true
}
} else if req.Filters.State != "" {
Expand Down Expand Up @@ -278,13 +297,7 @@ func (k Querier) Bids(c context.Context, req *types.QueryBidsRequest) (*types.Qu
return nil, status.Error(codes.Internal, err.Error())
}

if len(pageRes.NextKey) > 0 {
nextKey := make([]byte, len(searchPrefix)+len(pageRes.NextKey))
copy(nextKey, searchPrefix)
copy(nextKey[len(searchPrefix):], pageRes.NextKey)

pageRes.NextKey = nextKey
}
// Keep raw Cosmos SDK nextKey; do not prepend searchPrefix

req.Pagination.Limit -= count
total += count
Expand Down Expand Up @@ -346,8 +359,19 @@ func (k Querier) Leases(c context.Context, req *types.QueryLeasesRequest) (*type
var key []byte
var unsolicited []byte
var err error
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(req.Pagination.Key)

// Accept both raw and base64-encoded keys: try raw first, then base64.
paginationKeyBytes := req.Pagination.Key
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(paginationKeyBytes)
if err != nil {
if decoded, decErr := base64.StdEncoding.DecodeString(string(req.Pagination.Key)); decErr == nil {
states, searchPrefix, key, unsolicited, err = query.DecodePaginationKey(decoded)
}
}
if err != nil {
if errors.Is(err, query.ErrInvalidPaginationKey) {
return nil, status.Error(codes.InvalidArgument, err.Error())
}
return nil, status.Error(codes.Internal, err.Error())
}

Expand Down
Loading