From dcc93dee965a39d9b4ee9dca79f546c497baa77e Mon Sep 17 00:00:00 2001
From: Sale Djenic <aleksandardjenic@status.im>
Date: Thu, 9 May 2024 14:07:41 +0200
Subject: [PATCH] fix_: handling throughput limit error from providers

---
 rpc/chain/client.go      | 38 +++++++++++++++++++++++++++++++++++---
 rpc/chain/rpc_limiter.go |  2 +-
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/rpc/chain/client.go b/rpc/chain/client.go
index 865b1c887..7c1e72532 100644
--- a/rpc/chain/client.go
+++ b/rpc/chain/client.go
@@ -172,7 +172,9 @@ func isVMError(err error) bool {
 }
 
 func isRPSLimitError(err error) bool {
-	return strings.Contains(err.Error(), "backoff_seconds")
+	return strings.Contains(err.Error(), "backoff_seconds") ||
+		strings.Contains(err.Error(), "has exceeded its throughput limit") ||
+		strings.Contains(err.Error(), "request rate exceeded")
 }
 
 func (c *ClientWithFallback) SetIsConnected(value bool) {
@@ -216,10 +218,25 @@ func (c *ClientWithFallback) makeCall(ctx context.Context, main func() ([]any, e
 		if err != nil {
 			if isRPSLimitError(err) {
 				c.mainLimiter.ReduceLimit()
-			} else if isVMError(err) {
+
+				err = c.mainLimiter.WaitForRequestsAvailability(1)
+				if err != nil {
+					return err
+				}
+
+				res, err = main()
+				if err == nil {
+					resultChan <- CommandResult{res: res}
+					return nil
+				}
+
+			}
+
+			if isVMError(err) {
 				resultChan <- CommandResult{err: err}
 				return nil
 			}
+
 			return err
 		}
 		resultChan <- CommandResult{res: res}
@@ -238,10 +255,25 @@ func (c *ClientWithFallback) makeCall(ctx context.Context, main func() ([]any, e
 		if err != nil {
 			if isRPSLimitError(err) {
 				c.fallbackLimiter.ReduceLimit()
-			} else if isVMError(err) {
+
+				err = c.fallbackLimiter.WaitForRequestsAvailability(1)
+				if err != nil {
+					return err
+				}
+
+				res, err = fallback()
+				if err == nil {
+					resultChan <- CommandResult{res: res}
+					return nil
+				}
+
+			}
+
+			if isVMError(err) {
 				resultChan <- CommandResult{err: err}
 				return nil
 			}
+
 			return err
 		}
 		resultChan <- CommandResult{res: res}
diff --git a/rpc/chain/rpc_limiter.go b/rpc/chain/rpc_limiter.go
index b0db5d23b..fc7c4c22a 100644
--- a/rpc/chain/rpc_limiter.go
+++ b/rpc/chain/rpc_limiter.go
@@ -9,7 +9,7 @@ import (
 )
 
 const (
-	defaultMaxRequestsPerSecond = 100
+	defaultMaxRequestsPerSecond = 50
 	minRequestsPerSecond        = 20
 	requestsPerSecondStep       = 10