From 8c30a8e1bb7469e6184d1ac6289676aec27b719d Mon Sep 17 00:00:00 2001
From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
Date: Wed, 3 Dec 2025 11:55:34 +0100
Subject: [PATCH] Rest store api constraints default page size to 20 and max to
 100 (#3602)

Co-authored-by: Vishwanath Martur <64204611+vishwamartur@users.noreply.github.com>
---
 docs/api/rest-api.md                        | 3 +++
 docs/operators/how-to/configure-rest-api.md | 3 ++-
 waku/rest_api/endpoint/store/client.nim     | 2 +-
 waku/rest_api/endpoint/store/handlers.nim   | 8 ++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/docs/api/rest-api.md b/docs/api/rest-api.md
index eeb90abfb..cc8e51020 100644
--- a/docs/api/rest-api.md
+++ b/docs/api/rest-api.md
@@ -38,6 +38,9 @@ A particular OpenAPI spec can be easily imported into [Postman](https://www.post
 curl http://localhost:8645/debug/v1/info -s | jq
 ```
 
+### Store API
+
+The `page_size` flag in the Store API has a default value of 20 and a max value of 100.
 
 ### Node configuration
 Find details [here](https://github.com/waku-org/nwaku/tree/master/docs/operators/how-to/configure-rest-api.md)
diff --git a/docs/operators/how-to/configure-rest-api.md b/docs/operators/how-to/configure-rest-api.md
index 3fe070aab..7a58a798c 100644
--- a/docs/operators/how-to/configure-rest-api.md
+++ b/docs/operators/how-to/configure-rest-api.md
@@ -1,4 +1,3 @@
-
 # Configure a REST API node
 
 A subset of the node configuration can be used to modify the behaviour of the HTTP REST API.
@@ -21,3 +20,5 @@ Example:
 ```shell
 wakunode2 --rest=true
 ```
+
+The `page_size` flag in the Store API has a default value of 20 and a max value of 100.
diff --git a/waku/rest_api/endpoint/store/client.nim b/waku/rest_api/endpoint/store/client.nim
index 80939ee25..71ba7610d 100644
--- a/waku/rest_api/endpoint/store/client.nim
+++ b/waku/rest_api/endpoint/store/client.nim
@@ -57,7 +57,7 @@ proc getStoreMessagesV3*(
   # Optional cursor fields
   cursor: string = "", # base64-encoded hash
   ascending: string = "",
-  pageSize: string = "",
+  pageSize: string = "20", # default value is 20
 ): RestResponse[StoreQueryResponseHex] {.
   rest, endpoint: "/store/v3/messages", meth: HttpMethod.MethodGet
 .}
diff --git a/waku/rest_api/endpoint/store/handlers.nim b/waku/rest_api/endpoint/store/handlers.nim
index 79724b9d7..7d37191fb 100644
--- a/waku/rest_api/endpoint/store/handlers.nim
+++ b/waku/rest_api/endpoint/store/handlers.nim
@@ -129,6 +129,14 @@ proc createStoreQuery(
     except CatchableError:
       return err("page size parsing error: " & getCurrentExceptionMsg())
 
+  # Enforce default value of page_size to 20
+  if parsedPagedSize.isNone():
+    parsedPagedSize = some(20.uint64)
+
+  # Enforce max value of page_size to 100
+  if parsedPagedSize.get() > 100:
+    parsedPagedSize = some(100.uint64)
+
   return ok(
     StoreQueryRequest(
       includeData: parsedIncludeData,