handle context deadline exceeded in direct tx (#2243)

Bisonai · Aug 28, 2024 · 055b603 · 055b603
1 parent deae0ca
commit 055b603
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/node/pkg/chain/helper/helper.go b/node/pkg/chain/helper/helper.go
@@ -272,7 +272,9 @@ func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contrac
 			if err != nil {
 				if utils.ShouldRetryWithSwitchedJsonRPC(err) {
 					clientIndex = (clientIndex + 1) % len(t.clients)
-				} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) || utils.IsNonceError(err) || err == context.DeadlineExceeded {
+				} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) {
+					return err // if transaction fails, the data will probably be too old to retry
+				} else if utils.IsNonceError(err) || err == context.DeadlineExceeded {
 					nonce, err = noncemanager.GetAndIncrementNonce(t.wallet)
 					if err != nil {
 						return err
@@ -297,7 +299,9 @@ func (t *ChainHelper) SubmitDelegatedFallbackDirect(ctx context.Context, contrac
 		if err != nil {
 			if utils.ShouldRetryWithSwitchedJsonRPC(err) {
 				clientIndex = (clientIndex + 1) % len(t.clients)
-			} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) || utils.IsNonceError(err) {
+			} else if errors.Is(err, errorSentinel.ErrChainTransactionFail) {
+				return err // if transaction fails, the data will probably be too old to retry
+			} else if utils.IsNonceError(err) || err == context.DeadlineExceeded {
 				nonce, err = noncemanager.GetAndIncrementNonce(t.wallet)
 				if err != nil {
 					return err