Apply tx rate-limit based on the configured TxRequestLimit flag value

m-Peter · m-Peter · commit 4e60c991e110 · 2025-02-14T11:24:53.000+02:00
diff --git a/services/requester/requester.go b/services/requester/requester.go
@@ -216,8 +216,12 @@ func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash,
 		return common.Hash{}, fmt.Errorf("failed to derive the sender: %w", err)
 	}
 
-	if e.config.FlowNetworkID == flowGo.Testnet {
-		_, _, _, ok, _ := e.limiter.Take(ctx, from.Hex())
+	rateLimitEnabled := e.config.TxRequestLimit > 0
+	if rateLimitEnabled {
+		_, _, _, ok, err := e.limiter.Take(ctx, from.Hex())
+		if err != nil {
+			return common.Hash{}, fmt.Errorf("failed to check rate limit: %w", err)
+		}
 		if !ok {
 			return common.Hash{}, errs.ErrRateLimit
 		}

Original file line number	Diff line number	Diff line change
`@@ -216,8 +216,12 @@ func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash,`
`216`	`216`	`return common.Hash{}, fmt.Errorf("failed to derive the sender: %w", err)`
`217`	`217`	`}`
`218`	`218`
`219`		`- if e.config.FlowNetworkID == flowGo.Testnet {`
`220`		`- _, _, _, ok, _ := e.limiter.Take(ctx, from.Hex())`
	`219`	`+ rateLimitEnabled := e.config.TxRequestLimit > 0`
	`220`	`+ if rateLimitEnabled {`
	`221`	`+ _, _, _, ok, err := e.limiter.Take(ctx, from.Hex())`
	`222`	`+ if err != nil {`
	`223`	`+ return common.Hash{}, fmt.Errorf("failed to check rate limit: %w", err)`
	`224`	`+ }`
`221`	`225`	`if !ok {`
`222`	`226`	`return common.Hash{}, errs.ErrRateLimit`
`223`	`227`	`}`