update

rainlanguage · Nov 21, 2024 · 7630d7b · 7630d7b
1 parent 2ab4788
commit 7630d7b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 6 deletions.
diff --git a/src/error.ts b/src/error.ts
@@ -11,11 +11,12 @@ import { abi as genericArbAbi } from "../test/abis/GenericPoolOrderBookV4ArbOrde
 import {
     isHex,
     BaseError,
+    TimeoutError,
     RpcRequestError,
+    FeeCapTooLowError,
     decodeErrorResult,
     ExecutionRevertedError,
     InsufficientFundsError,
-    FeeCapTooLowError,
     // InvalidInputRpcError,
     // TransactionRejectedRpcError,
 } from "viem";
@@ -113,6 +114,17 @@ export function containsNodeError(err: BaseError): boolean {
     }
 }
 
+/**
+ * Checks if a viem BaseError is timeout error
+ */
+export function isTimeout(err: BaseError): boolean {
+    try {
+        return err instanceof TimeoutError || ("cause" in err && isTimeout(err.cause as any));
+    } catch (error) {
+        return false;
+    }
+}
+
 /**
  * Handles a reverted transaction by simulating it and returning the revert error
  */

diff --git a/src/processOrders.ts b/src/processOrders.ts
@@ -9,7 +9,7 @@ import { BigNumber, Contract, ethers } from "ethers";
 import { Tracer } from "@opentelemetry/sdk-trace-base";
 import { Context, SpanStatusCode } from "@opentelemetry/api";
 import { fundOwnedOrders, getNonce, rotateAccounts } from "./account";
-import { containsNodeError, ErrorSeverity, errorSnapshot, handleRevert } from "./error";
+import { containsNodeError, ErrorSeverity, errorSnapshot, handleRevert, isTimeout } from "./error";
 import {
     Report,
     BotConfig,
@@ -318,8 +318,14 @@ export const processOrders = async (
                             if (e.error) {
                                 message = errorSnapshot(message, e.error);
                                 span.setAttribute("errorDetails", message);
+                                if (isTimeout(e.error)) {
+                                    span.setAttribute("severity", ErrorSeverity.LOW);
+                                } else {
+                                    span.setAttribute("severity", ErrorSeverity.HIGH);
+                                }
+                            } else {
+                                span.setAttribute("severity", ErrorSeverity.HIGH);
                             }
-                            span.setAttribute("severity", ErrorSeverity.HIGH);
                             span.setStatus({ code: SpanStatusCode.ERROR, message });
                             span.setAttribute("unsuccessfulClear", true);
                             span.setAttribute("txSendFailed", true);
@@ -343,14 +349,20 @@ export const processOrders = async (
                             if (e.error) {
                                 message = errorSnapshot(message, e.error);
                                 span.setAttribute("errorDetails", message);
+                                if (isTimeout(e.error)) {
+                                    span.setAttribute("severity", ErrorSeverity.LOW);
+                                } else {
+                                    span.setAttribute("severity", ErrorSeverity.HIGH);
+                                }
+                            } else {
+                                span.setAttribute("severity", ErrorSeverity.HIGH);
                             }
-                            span.setAttribute("severity", ErrorSeverity.HIGH);
                             span.setStatus({ code: SpanStatusCode.ERROR, message });
                             span.setAttribute("unsuccessfulClear", true);
                             span.setAttribute("txMineFailed", true);
                         } else {
                             // record the error for the span
-                            let message = pair + "unexpected error";
+                            let message = "unexpected error";
                             if (e.error) {
                                 message = errorSnapshot(message, e.error);
                                 span.recordException(e.error);
@@ -361,7 +373,7 @@ export const processOrders = async (
                         }
                     } else {
                         // record the error for the span
-                        let message = pair + ": unexpected error";
+                        let message = "unexpected error";
                         if (e.error) {
                             message = errorSnapshot(message, e.error);
                             span.recordException(e.error);