From 5d04da3ca29c39576185c3cf253209d594f3609e Mon Sep 17 00:00:00 2001
From: Dragan Milic <dragan@netice9.com>
Date: Fri, 6 Feb 2026 15:38:25 +0100
Subject: [PATCH] turn all RPC uint64 into hex encoded strings

---
 query_rpc.go | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/query_rpc.go b/query_rpc.go
index 8cab39c..e79495f 100644
--- a/query_rpc.go
+++ b/query_rpc.go
@@ -32,24 +32,24 @@ type IncludeData struct {
 }
 
 type Options struct {
-	AtBlock        *uint64      `json:"atBlock,omitempty"`
-	IncludeData    *IncludeData `json:"includeData,omitempty"`
-	ResultsPerPage *uint64      `json:"resultsPerPage,omitempty"`
-	Cursor         string       `json:"cursor,omitempty"`
+	AtBlock        *hexutil.Uint64 `json:"atBlock,omitempty"`
+	IncludeData    *IncludeData    `json:"includeData,omitempty"`
+	ResultsPerPage *hexutil.Uint64 `json:"resultsPerPage,omitempty"`
+	Cursor         string          `json:"cursor,omitempty"`
 }
 
 func (o *Options) GetAtBlock() uint64 {
 	if o == nil || o.AtBlock == nil {
 		return 0
 	}
-	return *o.AtBlock
+	return uint64(*o.AtBlock)
 }
 
 func (o *Options) GetResultsPerPage() uint64 {
-	if o == nil || o.ResultsPerPage == nil || *o.ResultsPerPage > QueryResultCountLimit {
+	if o == nil || o.ResultsPerPage == nil || uint64(*o.ResultsPerPage) > QueryResultCountLimit {
 		return QueryResultCountLimit
 	}
-	return *o.ResultsPerPage
+	return uint64(*o.ResultsPerPage)
 }
 
 func (o *Options) GetIncludeData() IncludeData {
@@ -81,7 +81,7 @@ func (o *Options) GetCursor() (*uint64, error) {
 
 type QueryResponse struct {
 	Data        []json.RawMessage `json:"data"`
-	BlockNumber uint64            `json:"blockNumber"`
+	BlockNumber hexutil.Uint64    `json:"blockNumber"`
 	Cursor      *string           `json:"cursor,omitempty"`
 }