Skip to content

release: merge develop into main #18

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

Merged
pythonberg1997 merged 2 commits into from
Oct 29, 2025
Merged

release: merge develop into main #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9471be5
chore: update example.config.toml (#16)
pythonberg1997 Oct 21, 2025
f0ff84d
chore: update MethodOverrides lims (#17)
pythonberg1997 Oct 29, 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
3 changes: 2 additions & 1 deletion example.config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ max_latency_threshold = "10s"
# Maximum latency accepted to serve requests before degraded, default 5s
max_degraded_latency_threshold = "5s"
# Maximum error rate accepted to serve requests, default 0.5 (i.e. 50%)
max_error_rate_threshold = 0.3
max_error_rate_threshold = 0.5

[backends]
# A map of backends by name.
Expand Down Expand Up @@ -126,6 +126,7 @@ eth_getBalance = "query"
eth_getBlockByHash = "query"
eth_getBlockByNumber = "query"
eth_getCode = "query"
eth_getHeaderByNumber = "query"
eth_getTransactionCount = "query"
eth_getTransactionReceipt = "query"
eth_maxPriorityFeePerGas = "query"
Expand Down
24 changes: 8 additions & 16 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,12 @@ func (s *Server) HandleRPC(w http.ResponseWriter, r *http.Request) {
if method == "" {
lim = s.mainLim
} else {
// Check if there's a method-specific override
lim = s.overrideLims[method]
// If no override exists, fallback to base rate limiter
if lim == nil {
lim = s.mainLim
}
}

if lim == nil {
Expand Down Expand Up @@ -510,23 +515,10 @@ func (s *Server) handleBatchRPC(ctx context.Context, reqs []json.RawMessage, isL
continue
}

// Take base rate limit first
if isLimited("") {
log.Debug(
"rate limited individual RPC in a batch request",
"source", "rpc",
"req_id", parsedReq.ID,
"method", parsedReq.Method,
)
RecordRPCError(ctx, BackendProxyd, parsedReq.Method, ErrOverRateLimit)
responses[i] = NewRPCErrorRes(parsedReq.ID, ErrOverRateLimit)
continue
}

// Take rate limit for specific methods.
if _, ok := s.overrideLims[parsedReq.Method]; ok && isLimited(parsedReq.Method) {
// Check rate limit (method override if exists, otherwise base rate)
if isLimited(parsedReq.Method) {
log.Debug(
"rate limited specific RPC",
"rate limited RPC",
"source", "rpc",
"req_id", GetReqID(ctx),
"method", parsedReq.Method,
Expand Down