update

rainlanguage · Dec 10, 2024 · a88ef1d · a88ef1d
1 parent fce0605
commit a88ef1d
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 11 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -237,7 +237,7 @@ export function getBountyEnsureBytecode(
     const minimum = minimumExcepted.toHexString().substring(2).padStart(64, "0");
     const msgSender = sender.substring(2).padStart(64, "0").toLowerCase();
     // rainlang bytecode:
-    // :ensure(sender context<0 0>()),
+    // :ensure(equal-to(sender context<0 0>()) \"unknown sender\"),
     // :ensure(
     //   greater-than-or-equal-to(
     //     add(
@@ -283,7 +283,7 @@ export function getWithdrawEnsureBytecode(
     const minimum = minimumExcepted.toHexString().substring(2).padStart(64, "0");
     const msgSender = sender.substring(2).padStart(64, "0").toLowerCase();
     // rainlang bytecode:
-    // :ensure(sender context<0 0>()),
+    // :ensure(equal-to(sender context<0 0>()) \"unknown sender\"),
     // :ensure(
     //   greater-than-or-equal-to(
     //     add(

diff --git a/src/error.ts b/src/error.ts
@@ -35,6 +35,15 @@ export enum ErrorSeverity {
     HIGH = "HIGH",
 }
 
+/**
+ * Known errors
+ */
+export const KnownErrors = [
+    "unknown sender",
+    "minimumSenderOutput",
+    "MinimalOutputBalanceViolation",
+] as const;
+
 /**
  * Specifies a decoded contract error
  */
@@ -167,7 +176,15 @@ export async function handleRevert(
     receipt: TransactionReceipt,
     rawtx: RawTx,
     signerBalance: BigNumber,
-): Promise<{ err: any; nodeError: boolean; snapshot: string } | undefined> {
+): Promise<
+    | {
+          err: any;
+          nodeError: boolean;
+          snapshot: string;
+          rawRevertError?: TxRevertError;
+      }
+    | undefined
+> {
     const header = "transaction reverted onchain";
     try {
         const gasErr = checkGasIssue(receipt, rawtx, signerBalance);
@@ -189,13 +206,14 @@ export async function handleRevert(
         });
         const msg =
             header +
-            " and simulation failed to find out what was the revert reason, please try to simulate the tx manualy for more details";
+            " and simulation failed to find the revert reason, please try to simulate the tx manualy for more details";
         return { err: msg, nodeError: false, snapshot: msg };
     } catch (err: any) {
         return {
             err,
             nodeError: containsNodeError(err),
             snapshot: errorSnapshot(header, err, { receipt, rawtx, signerBalance }),
+            rawRevertError: parseRevertError(err),
         };
     }
 }

diff --git a/src/processOrders.ts b/src/processOrders.ts
@@ -10,7 +10,7 @@ import { privateKeyToAccount } from "viem/accounts";
 import { BigNumber, Contract, ethers } from "ethers";
 import { Tracer } from "@opentelemetry/sdk-trace-base";
 import { Context, SpanStatusCode } from "@opentelemetry/api";
-import { ErrorSeverity, errorSnapshot, isTimeout } from "./error";
+import { ErrorSeverity, errorSnapshot, isTimeout, KnownErrors } from "./error";
 import {
     Report,
     BotConfig,
@@ -359,6 +359,9 @@ export const processOrders = async (
                         } else {
                             message = errorSnapshot("transaction reverted onchain", e.error.err);
                         }
+                        if (KnownErrors.some((v) => message.includes(v))) {
+                            span.setAttribute("severity", ErrorSeverity.HIGH);
+                        }
                         span.setAttribute("errorDetails", message);
                     }
                     if (e.spanAttributes["txNoneNodeError"]) {

diff --git a/src/tx.ts b/src/tx.ts
@@ -113,7 +113,14 @@ export async function handleTransaction(
             );
         } catch (e: any) {
             try {
-                const newReceipt = await viemClient.getTransactionReceipt({ hash: txhash });
+                const newReceipt = await (async () => {
+                    try {
+                        return await viemClient.getTransactionReceipt({ hash: txhash });
+                    } catch {
+                        await sleep(Math.max(90_000 + time - Date.now(), 0));
+                        return await viemClient.getTransactionReceipt({ hash: txhash });
+                    }
+                })();
                 if (newReceipt) {
                     return handleReceipt(
                         txhash,
@@ -274,12 +281,9 @@ export async function handleReceipt(
         }
         return result;
     } else {
-        // wait at least 60s before simulating the revert tx
+        // wait at least 90s before simulating the revert tx
         // in order for rpcs to catch up
-        const wait = 60000 - Date.now() + time;
-        if (wait > 0) {
-            await sleep(wait);
-        }
+        await sleep(Math.max(90_000 + time - Date.now(), 0));
         const simulation = await handleRevert(
             signer,
             txhash as `0x${string}`,