use reflect to accept codec.ProtoMarshaler

types/query/filtered_pagination.go

@@ -2,6 +2,7 @@ package query
 
 import (
 	"fmt"
+	"reflect"
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/store/types"
@@ -116,11 +117,11 @@ func FilteredPaginate(
 	return res, nil
 }
 
-func GenericFilteredPaginate[V any, F codec.ProtoMarshaler](
+func GenericFilteredPaginate[T codec.ProtoMarshaler, F codec.ProtoMarshaler](
 	cdc codec.BinaryCodec,
 	prefixStore types.KVStore,
 	pageRequest *PageRequest,
-	onResult func(key []byte, value V) (F, error),
+	onResult func(key []byte, value T) (F, error),
 ) ([]F, *PageResponse, error) {
 	// if the PageRequest is nil, use default PageRequest
 	if pageRequest == nil {
@@ -162,13 +163,18 @@ func GenericFilteredPaginate[V any, F codec.ProtoMarshaler](
 				return nil, nil, iterator.Error()
 			}
 
-			protoMsg := any(new(V))
-			err := cdc.Unmarshal(iterator.Value(), protoMsg.(codec.ProtoMarshaler))
+			// initialize the proto message
+			va := reflect.ValueOf(new(T)).Elem()
+			v := reflect.New(va.Type().Elem())
+			va.Set(v)
+			protoMsg := va.Interface().(codec.ProtoMarshaler)
+
+			err := cdc.Unmarshal(iterator.Value(), protoMsg)
 			if err != nil {
 				return nil, nil, err
 			}
 
-			val, err := onResult(iterator.Key(), *(protoMsg.(*V)))
+			val, err := onResult(iterator.Key(), protoMsg.(T))
 			if err != nil {
 				return nil, nil, err
 			}
@@ -197,13 +203,18 @@ func GenericFilteredPaginate[V any, F codec.ProtoMarshaler](
 			return nil, nil, iterator.Error()
 		}
 
-		protoMsg := any(new(V))
-		err := cdc.Unmarshal(iterator.Value(), protoMsg.(codec.ProtoMarshaler))
+		// initialize the proto message
+		va := reflect.ValueOf(new(T)).Elem()
+		v := reflect.New(va.Type().Elem())
+		va.Set(v)
+		protoMsg := va.Interface().(codec.ProtoMarshaler)
+
+		err := cdc.Unmarshal(iterator.Value(), protoMsg)
 		if err != nil {
 			return nil, nil, err
 		}
 
-		val, err := onResult(iterator.Key(), *(protoMsg.(*V)))
+		val, err := onResult(iterator.Key(), (protoMsg).(T))
 		if err != nil {
 			return nil, nil, err
 		}

x/authz/keeper/grpc_query.go

@@ -61,7 +61,7 @@ func (k Keeper) Grants(c context.Context, req *authz.QueryGrantsRequest) (*authz
 	key := grantStoreKey(grantee, granter, "")
 	grantsStore := prefix.NewStore(store, key)
 
-	authorizations, pageRes, err := query.GenericFilteredPaginate(k.cdc, grantsStore, req.Pagination, func(key []byte, auth authz.Grant) (*authz.Grant, error) {
+	authorizations, pageRes, err := query.GenericFilteredPaginate(k.cdc, grantsStore, req.Pagination, func(key []byte, auth *authz.Grant) (*authz.Grant, error) {
 		auth1, err := auth.GetAuthorization()
 		if err != nil {
 			return nil, err
@@ -101,7 +101,7 @@ func (k Keeper) GranterGrants(c context.Context, req *authz.QueryGranterGrantsRe
 	store := ctx.KVStore(k.storeKey)
 	authzStore := prefix.NewStore(store, grantStoreKey(nil, granter, ""))
 
-	grants, pageRes, err := query.GenericFilteredPaginate(k.cdc, authzStore, req.Pagination, func(key []byte, auth authz.Grant) (*authz.GrantAuthorization, error) {
+	grants, pageRes, err := query.GenericFilteredPaginate(k.cdc, authzStore, req.Pagination, func(key []byte, auth *authz.Grant) (*authz.GrantAuthorization, error) {
 		auth1, err := auth.GetAuthorization()
 		if err != nil {
 			return nil, err
@@ -146,7 +146,7 @@ func (k Keeper) GranteeGrants(c context.Context, req *authz.QueryGranteeGrantsRe
 	ctx := sdk.UnwrapSDKContext(c)
 	store := prefix.NewStore(ctx.KVStore(k.storeKey), GrantKey)
 
-	authorizations, pageRes, err := query.GenericFilteredPaginate(k.cdc, store, req.Pagination, func(key []byte, auth authz.Grant) (*authz.GrantAuthorization, error) {
+	authorizations, pageRes, err := query.GenericFilteredPaginate(k.cdc, store, req.Pagination, func(key []byte, auth *authz.Grant) (*authz.GrantAuthorization, error) {
 		auth1, err := auth.GetAuthorization()
 		if err != nil {
 			return nil, err